From: Mimi Zohar Date: Wed, 20 Jan 2010 20:35:41 +0000 (-0500) Subject: fix ima breakage X-Git-Tag: v2.6.33-rc8~44^2~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8eb988c70e7709b7bd1a69f0ec53d19ac20dea84;p=pandora-kernel.git 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 Signed-off-by: Al Viro --- Reading git-diff-tree failed