Files
linux-legacy/drivers/char
James Morris cb5629b10d Merge branch 'master' into next
Conflicts:
	fs/namei.c

Manually merged per:

diff --cc fs/namei.c
index 734f2b5,bbc15c2..0000000
--- a/fs/namei.c
+++ b/fs/namei.c
@@@ -860,9 -848,8 +849,10 @@@ static int __link_path_walk(const char
  		nd->flags |= LOOKUP_CONTINUE;
  		err = exec_permission_lite(inode);
  		if (err == -EAGAIN)
- 			err = vfs_permission(nd, MAY_EXEC);
+ 			err = inode_permission(nd->path.dentry->d_inode,
+ 					       MAY_EXEC);
 +		if (!err)
 +			err = ima_path_check(&nd->path, MAY_EXEC);
   		if (err)
  			break;

@@@ -1525,14 -1506,9 +1509,14 @@@ int may_open(struct path *path, int acc
  		flag &= ~O_TRUNC;
  	}

- 	error = vfs_permission(nd, acc_mode);
+ 	error = inode_permission(inode, acc_mode);
  	if (error)
  		return error;
 +
- 	error = ima_path_check(&nd->path,
++	error = ima_path_check(path,
 +			       acc_mode & (MAY_READ | MAY_WRITE | MAY_EXEC));
 +	if (error)
 +		return error;
  	/*
  	 * An append-only file must be opened in append mode for writing.
  	 */

Signed-off-by: James Morris <jmorris@namei.org>
2009-02-06 11:01:45 +11:00
..
2009-01-02 10:19:42 -08:00
2009-01-02 10:19:38 -08:00
2009-02-06 11:01:45 +11:00
2008-06-20 14:05:55 -06:00
2008-12-13 11:25:49 -08:00
2008-10-20 08:52:41 -07:00
2008-12-13 09:12:07 +00:00
2008-07-20 17:12:36 -07:00
2008-06-20 14:05:57 -06:00
2008-12-03 21:04:09 +11:00
2009-01-02 10:19:40 -08:00
2009-01-02 10:28:32 -08:00
2009-01-31 01:21:59 +01:00
2008-06-20 14:05:48 -06:00
2008-02-07 08:42:25 -08:00
2008-04-30 08:29:43 -07:00
2008-07-24 10:47:14 -07:00
2009-01-02 10:19:40 -08:00
2009-01-02 10:19:40 -08:00
2009-01-02 10:19:40 -08:00
2009-01-12 16:37:00 -08:00
2009-01-02 10:19:40 -08:00
2008-07-20 17:12:38 -07:00
2009-01-08 16:44:03 -07:00
2009-01-02 10:19:40 -08:00
2008-11-11 21:14:11 -05:00
2008-07-20 17:12:38 -07:00
2009-01-02 10:19:40 -08:00
2009-01-15 16:39:37 -08:00
2009-01-02 10:19:40 -08:00
2009-01-02 10:19:40 -08:00
2008-06-20 14:05:51 -06:00
2008-04-30 23:15:34 +02:00
2008-12-09 20:32:06 +11:00
2009-01-02 10:19:38 -08:00
2008-10-16 16:52:05 +02:00
2009-01-02 10:19:40 -08:00
2009-01-08 08:31:15 -08:00