aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2014-11-04 11:27:12 +0100
committerBen Hutchings <ben@decadent.org.uk>2014-12-14 16:23:56 +0000
commit51a8f21b21a55c6b08eff1f9917489d11b4f2bfc (patch)
treedc29b8d1b9e6da1187e8c458ff1224ca49a3d113 /kernel
parentcfc515ec1f3d3d501897b269b262cc13cec7f9ed (diff)
downloadkernel_samsung_smdk4412-51a8f21b21a55c6b08eff1f9917489d11b4f2bfc.zip
kernel_samsung_smdk4412-51a8f21b21a55c6b08eff1f9917489d11b4f2bfc.tar.gz
kernel_samsung_smdk4412-51a8f21b21a55c6b08eff1f9917489d11b4f2bfc.tar.bz2
audit: keep inode pinned
commit 799b601451b21ebe7af0e6e8f6e2ccd4683c5064 upstream. Audit rules disappear when an inode they watch is evicted from the cache. This is likely not what we want. The guilty commit is "fsnotify: allow marks to not pin inodes in core", which didn't take into account that audit_tree adds watches with a zero mask. Adding any mask should fix this. Fixes: 90b1e7a57880 ("fsnotify: allow marks to not pin inodes in core") Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Signed-off-by: Paul Moore <pmoore@redhat.com> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/audit_tree.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c
index 0caf1f8..8a14284 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -154,6 +154,7 @@ static struct audit_chunk *alloc_chunk(int count)
chunk->owners[i].index = i;
}
fsnotify_init_mark(&chunk->mark, audit_tree_destroy_watch);
+ chunk->mark.mask = FS_IN_IGNORED;
return chunk;
}