]> git.baikalelectronics.ru Git - kernel.git/commit
fix ima breakage
authorMimi Zohar <zohar@linux.vnet.ibm.com>
Wed, 20 Jan 2010 20:35:41 +0000 (15:35 -0500)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 7 Feb 2010 08:06:22 +0000 (03:06 -0500)
commit41d0ceb64ed42e6d94181247a570ceeec7b7f188
tree6d0283a9fbca5cc104f591b9cc628edf39bc0b05
parent1fd78489a97ea6f57de549a4f4f90099e54c243c
fix ima breakage

The "Untangling ima mess, part 2 with counters" patch messed
up the counters.  Based on conversations with Al Viro, this patch
streamlines ima_path_check() by removing the counter maintaince.
The counters are now updated independently, from measuring the file,
in __dentry_open() and alloc_file() by calling ima_counts_get().
ima_path_check() is called from nfsd and do_filp_open().
It also did not measure all files that should have been measured.
Reason: ima_path_check() got bogus value passed as mask.
[AV: mea culpa]
[AV: add missing nfsd bits]

Signed-off-by: Mimi Zohar <zohar@us.ibm.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/namei.c
fs/nfsd/vfs.c
include/linux/ima.h
security/integrity/ima/ima_main.c