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