You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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>
|
16 years ago |
| .. |
|
Makefile
|
ipc: recompute msgmni on ipc namespace creation/removal
|
17 years ago |
|
compat.c
|
fix logic error in ipc compat semctl()
|
18 years ago |
|
compat_mq.c
|
…
|
|
|
ipc_sysctl.c
|
ipc/ipc_sysctl.c: move the definition of ipc_auto_callback()
|
16 years ago |
|
ipcns_notifier.c
|
ipc: do not use a negative value to re-enable msgmni automatic recomputing
|
17 years ago |
|
mqueue.c
|
[CVE-2009-0029] System call wrappers part 26
|
16 years ago |
|
msg.c
|
[CVE-2009-0029] System call wrappers part 24
|
16 years ago |
|
msgutil.c
|
[PATCH] getting rid of all casts of k[cmz]alloc() calls
|
18 years ago |
|
namespace.c
|
ipc: recompute msgmni on ipc namespace creation/removal
|
17 years ago |
|
sem.c
|
[CVE-2009-0029] System call wrappers part 25
|
16 years ago |
|
shm.c
|
Merge branch 'master' into next
|
16 years ago |
|
util.c
|
sanitize audit_ipc_set_perm()
|
16 years ago |
|
util.h
|
ipc: get rid of ipc_lock_down()
|
17 years ago |
