commit 6d11cfdba52af08b889fd6d3ee4212930493eb38
author Pablo Neira Ayuso <pablo@netfilter.org> Wed May 22 22:42:36 2013 +0000
committer Pablo Neira Ayuso <pablo@netfilter.org> Thu May 23 14:22:30 2013 +0200
tree a6de2aaf9eb6ca94884faa8e56bc2960fd6c1467
parent 8bc14d25ffb9dfc242d3a877bb4fe683adb27692

netfilter: don't panic on error while walking through the init path

Don't panic if we hit an error while adding the nf_log or pernet
netfilter support, just bail out.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Gao feng <gaofeng@cn.fujitsu.com>

net/socket.c

diff --git a/net/socket.c b/net/socket.c
index 6b94633..734194d 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2612,7 +2612,9 @@
 	 */
 
 #ifdef CONFIG_NETFILTER
-	netfilter_init();
+	err = netfilter_init();
+	if (err)
+		goto out;
 #endif
 
 #ifdef CONFIG_NETWORK_PHY_TIMESTAMPING