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
..
Kconfig
Makefile
tpm.c	TPM: integrity fix	2009-02-06 09:06:43 +11:00
tpm.h	TPM: integrity interface	2009-02-03 11:23:12 +11:00
tpm_atmel.c
tpm_atmel.h
tpm_bios.c	ACPI: remove private acpica headers from driver files	2008-12-31 01:15:22 -05:00
tpm_infineon.c
tpm_nsc.c	tpm: clean up tpm_nsc driver for platform_device suspend/resume compliance	2009-01-08 08:31:12 -08:00
tpm_tis.c	The tpm_dev_release function is only called for platform devices, not pnp	2008-10-11 09:04:39 +11:00