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
..
compat_mq.c
compat.c
ipc_sysctl.c	ipc/ipc_sysctl.c: move the definition of ipc_auto_callback()	2009-01-06 15:59:29 -08:00
ipcns_notifier.c	ipc: do not use a negative value to re-enable msgmni automatic recomputing	2008-07-25 10:53:42 -07:00
Makefile	ipc: recompute msgmni on ipc namespace creation/removal	2008-04-29 08:06:12 -07:00
mqueue.c	[CVE-2009-0029] System call wrappers part 26	2009-01-14 14:15:29 +01:00
msg.c	[CVE-2009-0029] System call wrappers part 24	2009-01-14 14:15:28 +01:00
msgutil.c
namespace.c	ipc: recompute msgmni on ipc namespace creation/removal	2008-04-29 08:06:12 -07:00
sem.c	[CVE-2009-0029] System call wrappers part 25	2009-01-14 14:15:28 +01:00
shm.c	Merge branch 'master' into next	2009-02-06 11:01:45 +11:00
util.c	sanitize audit_ipc_set_perm()	2009-01-04 15:14:40 -05:00
util.h	ipc: get rid of ipc_lock_down()	2008-07-25 10:53:42 -07:00