]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Fri, 6 Feb 2009 00:01:45 +0000 (11:01 +1100)
committerJames Morris <jmorris@namei.org>
Fri, 6 Feb 2009 00:01:45 +0000 (11:01 +1100)
commitcb5629b10d64a8006622ce3a52bc887d91057d69
tree7c06d8f30783115e3384721046258ce615b129c5
parent8920d5ad6ba74ae8ab020e90cc4d976980e68701
parentf01d1d546abb2f4028b5299092f529eefb01253a
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>
12 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
fs/exec.c
fs/file_table.c
fs/inode.c
fs/namei.c
include/linux/audit.h
ipc/shm.c
mm/mmap.c
mm/shmem.c
security/Kconfig
security/inode.c