summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2014-11-04 11:27:12 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-21 09:23:01 -0800
commita5d002baef69d3e6f1ba772b6a33a7964764c1b1 (patch)
treec64a4943034c89cec9b125644c832d665c15fcd5 /kernel
parent1035897060b3e20bf0e166734ba90f9057e4fd29 (diff)
downloadrenesas_kernel-a5d002baef69d3e6f1ba772b6a33a7964764c1b1.tar.gz
renesas_kernel-a5d002baef69d3e6f1ba772b6a33a7964764c1b1.tar.bz2
renesas_kernel-a5d002baef69d3e6f1ba772b6a33a7964764c1b1.zip
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 135944a7b28..a79db03990d 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;
}