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