diff --git a/[refs] b/[refs] index 0cc44fafeea1..3aaceaeee56f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf45da97a45f634422559ec61429dddf4d2fffb9 +refs/heads/master: 71e1c784b24a026a490b3de01541fc5ee14ebc09 diff --git a/trunk/kernel/audit.c b/trunk/kernel/audit.c index c9345d3e8ada..04fe2e301b61 100644 --- a/trunk/kernel/audit.c +++ b/trunk/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;