[PATCH] fix audit_init failure path

Make audit_init() failure path handle situations where the audit_panic()
action is not AUDIT_FAIL_PANIC (default is AUDIT_FAIL_PRINTK).  Other uses
of audit_sock are not reached unless audit's netlink message handler is
properly registered.  Bug noticed by Peter Staubach.

Signed-off-by: Amy Griffis <amy.griffis@hp.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 2 insertions, 1 deletions

diff --git a/kernel/audit.c b/kernel/audit.c
index c9345d3e8ada..04fe2e301b61 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -558,8 +558,9 @@ static int __init audit_init(void)
                                            THIS_MODULE);
         if (!audit_sock)
                 audit_panic("cannot initialize netlink socket");
+        else
+                audit_sock->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT;
 
-        audit_sock->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT;
         skb_queue_head_init(&audit_skb_queue);
         audit_initialized = 1;
         audit_enabled = audit_default;