Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next

[karo-tx-linux.git] / net / socket.c

diff --git a/net/socket.c b/net/socket.c
index 9ff6366fee13d1bb2e889fcf5726b39299feaf8a..1b930074a292ec94cead6b99cb6c5dfa1a2ba129 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -2641,7 +2641,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