aboutsummaryrefslogtreecommitdiff
path: root/net/socket.c
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2013-05-22 22:42:36 +0000
committerPablo Neira Ayuso <pablo@netfilter.org>2013-05-23 14:22:30 +0200
commit6d11cfdba52af08b889fd6d3ee4212930493eb38 (patch)
treea6de2aaf9eb6ca94884faa8e56bc2960fd6c1467 /net/socket.c
parent8bc14d25ffb9dfc242d3a877bb4fe683adb27692 (diff)
downloadlinux-6d11cfdba52af08b889fd6d3ee4212930493eb38.tar.gz
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>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/socket.c b/net/socket.c
index 6b94633ca61..734194d3624 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2612,7 +2612,9 @@ static int __init sock_init(void)
*/
#ifdef CONFIG_NETFILTER
- netfilter_init();
+ err = netfilter_init();
+ if (err)
+ goto out;
#endif
#ifdef CONFIG_NETWORK_PHY_TIMESTAMPING