summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmy Griffis <amy.griffis@hp.com>2006-07-13 13:17:12 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2006-08-03 10:50:39 -0400
commit6988434ee5f532c71be3131fba23283f5cf43847 (patch)
treebdec2a0f267af6b3067dca31753565db25c28127
parent73d3ec5abad3f1730ac8530899d2c14d92f3ad63 (diff)
downloadop-kernel-dev-6988434ee5f532c71be3131fba23283f5cf43847.zip
op-kernel-dev-6988434ee5f532c71be3131fba23283f5cf43847.tar.gz
[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>
-rw-r--r--kernel/audit.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index d417ca1..0a36091e 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -690,9 +690,7 @@ static const struct inotify_operations audit_inotify_ops = {
/* Initialize audit support at boot time. */
static int __init audit_init(void)
{
-#ifdef CONFIG_AUDITSYSCALL
int i;
-#endif
printk(KERN_INFO "audit: initializing netlink socket (%s)\n",
audit_default ? "enabled" : "disabled");
@@ -717,10 +715,10 @@ static int __init audit_init(void)
audit_ih = inotify_init(&audit_inotify_ops);
if (IS_ERR(audit_ih))
audit_panic("cannot initialize inotify handle");
+#endif
for (i = 0; i < AUDIT_INODE_BUCKETS; i++)
INIT_LIST_HEAD(&audit_inode_hash[i]);
-#endif
return 0;
}
OpenPOWER on IntegriCloud