[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: Amy Griffis <amy.griffis@hp.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
parent
73d3ec5aba
commit
6988434ee5
1 changed files with 1 additions and 3 deletions
|
@ -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)
|
||||||
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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue