diff options
| author | Amy Griffis <amy.griffis@hp.com> | 2006-03-07 04:40:05 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-03-20 20:08:55 +0100 |
| commit | 71e1c784b24a026a490b3de01541fc5ee14ebc09 (patch) | |
| tree | 7ee3aebf84b5bd1759b2b1925e09de37cb21d97f /kernel | |
| parent | [PATCH] EXPORT_SYMBOL patch for audit_log, audit_log_start, audit_log_end and... (diff) | |
| download | linux-71e1c784b24a026a490b3de01541fc5ee14ebc09.tar.xz linux-71e1c784b24a026a490b3de01541fc5ee14ebc09.zip | |
[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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/audit.c | 3 |
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; |