From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Tue, 17 Dec 2013 03:10:41 +0000 (+0800)
Subject: audit: print error message when fail to create audit socket
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=11ee39ebf756821966fe1e2f65df4f728098d467;p=linux-beck.git

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>
---

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;
 }