Commit 6988434e authored by Amy Griffis's avatar Amy Griffis Committed by Al Viro

[PATCH] fix oops with CONFIG_AUDIT and !CONFIG_AUDITSYSCALL

Always initialize the audit_inode_hash[] so we don't oops on list rules.
Signed-off-by: default avatarAmy Griffis <amy.griffis@hp.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 73d3ec5a
...@@ -690,9 +690,7 @@ static const struct inotify_operations audit_inotify_ops = { ...@@ -690,9 +690,7 @@ static const struct inotify_operations audit_inotify_ops = {
/* Initialize audit support at boot time. */ /* Initialize audit support at boot time. */
static int __init audit_init(void) static int __init audit_init(void)
{ {
#ifdef CONFIG_AUDITSYSCALL
int i; int i;
#endif
printk(KERN_INFO "audit: initializing netlink socket (%s)\n", printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
audit_default ? "enabled" : "disabled"); audit_default ? "enabled" : "disabled");
...@@ -717,10 +715,10 @@ static int __init audit_init(void) ...@@ -717,10 +715,10 @@ static int __init audit_init(void)
audit_ih = inotify_init(&audit_inotify_ops); audit_ih = inotify_init(&audit_inotify_ops);
if (IS_ERR(audit_ih)) if (IS_ERR(audit_ih))
audit_panic("cannot initialize inotify handle"); audit_panic("cannot initialize inotify handle");
#endif
for (i = 0; i < AUDIT_INODE_BUCKETS; i++) for (i = 0; i < AUDIT_INODE_BUCKETS; i++)
INIT_LIST_HEAD(&audit_inode_hash[i]); INIT_LIST_HEAD(&audit_inode_hash[i]);
#endif
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment