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 |
| .. |
|
acpi
|
ACPI: fix ACPI_FADT_S4_RTC_WAKE comment
|
16 years ago |
|
asm-arm
|
…
|
|
|
asm-frv
|
byteorder: make swab.h include asm/swab.h like a regular header
|
16 years ago |
|
asm-generic
|
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
|
16 years ago |
|
asm-h8300
|
…
|
|
|
asm-m32r
|
byteorder: make swab.h include asm/swab.h like a regular header
|
16 years ago |
|
asm-mn10300
|
byteorder: make swab.h include asm/swab.h like a regular header
|
16 years ago |
|
crypto
|
…
|
|
|
drm
|
drm: Rip out the racy, unused vblank signal code.
|
16 years ago |
|
keys
|
…
|
|
|
linux
|
Merge branch 'master' into next
|
16 years ago |
|
math-emu
|
…
|
|
|
media
|
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
|
16 years ago |
|
mtd
|
headers_check fix: mtd/inftl-user.h
|
16 years ago |
|
net
|
net: wrong test in inet_ehash_locks_alloc()
|
16 years ago |
|
pcmcia
|
…
|
|
|
rdma
|
…
|
|
|
rxrpc
|
…
|
|
|
scsi
|
[SCSI] iscsi_tcp: make padbuf non-static
|
16 years ago |
|
sound
|
headers_check fix: sound/hdsp.h
|
16 years ago |
|
trace
|
…
|
|
|
video
|
atyfb: fix CONFIG_ namespace violations
|
16 years ago |
|
xen
|
xen: add xenfs to allow usermode <-> Xen interaction
|
16 years ago |
|
Kbuild
|
…
|
|
