summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGao feng <gaofeng@cn.fujitsu.com>2013-12-17 11:10:41 +0800
committerEric Paris <eparis@redhat.com>2014-01-13 22:32:44 -0500
commit11ee39ebf756821966fe1e2f65df4f728098d467 (patch)
tree2bbdc6929b99f9a2d179a47b95f6674141177521
parent5ee9a75c9fdaebd3ac8176f9f5c73fdcd27c1ad1 (diff)
audit: print error message when fail to create audit socket
print the error message and then return -ENOMEM. Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com> Acked-by: Eric Paris <eparis@redhat.com> Signed-off-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--kernel/audit.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 15661ef8bece..b27b7063654c 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1082,12 +1082,11 @@ static int __net_init audit_net_init(struct net *net)
pr_info("audit: initializing netlink socket in namespace\n");
aunet->nlsk = netlink_kernel_create(net, NETLINK_AUDIT, &cfg);
- if (aunet->nlsk == NULL)
- return -ENOMEM;
- if (!aunet->nlsk)
+ if (aunet->nlsk == NULL) {
audit_panic("cannot initialize netlink socket in namespace");
- else
- aunet->nlsk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT;
+ return -ENOMEM;
+ }
+ aunet->nlsk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT;
return 0;
}