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-16 14:45:34 -05:00
2009-02-03 16:53:56 -08:00
2009-01-28 15:55:48 -08:00
2009-02-06 11:01:45 +11:00
2009-02-02 23:26:57 -08:00
2009-01-19 15:36:21 -07:00
2009-01-28 17:15:52 +11:00
2009-01-29 20:19:48 +01:00
2009-01-27 02:15:47 -05:00
2009-01-29 18:04:43 -08:00
2009-01-31 15:08:56 -08:00
2009-01-29 11:23:12 +01:00
2009-02-05 12:56:47 -08:00
2009-01-26 21:19:53 +01:00
2009-02-03 16:53:56 -08:00
2009-01-29 18:09:41 -08:00
2009-01-16 15:05:54 -08:00
2009-01-26 12:24:38 -08:00
2009-01-30 11:34:11 +10:30
2009-02-01 10:41:02 -02:00
2009-02-05 12:56:49 -08:00
2009-02-02 20:57:07 +01:00
2009-02-03 16:52:10 -08:00
2009-02-04 07:52:21 -08:00
2009-01-17 17:26:39 +01:00
2009-01-29 18:19:29 -08:00
2009-01-27 15:35:51 -08:00
2009-02-05 12:56:47 -08:00
2009-01-26 02:09:26 +03:00
2009-01-30 21:50:49 +00:00
2009-02-05 12:56:48 -08:00
2009-01-25 17:59:26 -08:00
2009-01-25 08:14:53 -06:00
2009-01-30 08:40:54 -08:00
2009-01-26 21:19:54 +01:00
2009-01-29 18:19:29 -08:00
2009-02-02 17:52:39 +00:00
2009-01-23 12:57:20 +00:00
2009-02-05 12:56:48 -08:00
2009-02-02 19:17:56 -08:00
2009-01-24 16:48:42 +00:00
2009-01-29 13:20:36 +01:00