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>

diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 0060fde3160e0d029d29f527b3b4330850ebb356..de70f7b45b682126284a4162535659bfde8e5be1 100644 (file)
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -35,7 +35,7 @@ static inline void nf_inet_addr_mask(const union nf_inet_addr *a1,
        result->all[3] = a1->all[3] & mask->all[3];
 }
 
-extern void netfilter_init(void);
+extern int netfilter_init(void);
 
 /* Largest hook number + 1 */
 #define NF_MAX_HOOKS 8

diff --git a/net/netfilter/core.c b/net/netfilter/core.c
index 07c865a31a3d2adba8933c576f4228b0e8be6e55..300539db7bb1c245fc5a4529bd8801e4c5ac851f 100644 (file)
--- a/net/netfilter/core.c
+++ b/net/netfilter/core.c
@@ -302,17 +302,26 @@ static struct pernet_operations netfilter_net_ops = {
        .exit = netfilter_net_exit,
 };
 
-void __init netfilter_init(void)
+int __init netfilter_init(void)
 {
-       int i, h;
+       int i, h, ret;
+
        for (i = 0; i < ARRAY_SIZE(nf_hooks); i++) {
                for (h = 0; h < NF_MAX_HOOKS; h++)
                        INIT_LIST_HEAD(&nf_hooks[i][h]);
        }
 
-       if (register_pernet_subsys(&netfilter_net_ops) < 0)
-               panic("cannot create netfilter proc entry");
+       ret = register_pernet_subsys(&netfilter_net_ops);
+       if (ret < 0)
+               goto err;
+
+       ret = netfilter_log_init();
+       if (ret < 0)
+               goto err_pernet;
 
-       if (netfilter_log_init() < 0)
-               panic("cannot initialize nf_log");
+       return 0;
+err_pernet:
+       unregister_pernet_subsys(&netfilter_net_ops);
+err:
+       return ret;
 }

diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
index 388656d5a9ec45a6049af9e2915aaa7df1eefbbe..bd5474adcabc74f747077f8b7fcddc9d7bd07db7 100644 (file)
--- a/net/netfilter/nf_log.c
+++ b/net/netfilter/nf_log.c
@@ -368,10 +368,7 @@ static int __net_init nf_log_net_init(struct net *net)
        return 0;
 
 out_sysctl:
-       /* For init_net: errors will trigger panic, don't unroll on error. */
-       if (!net_eq(net, &init_net))
-               remove_proc_entry("nf_log", net->nf.proc_netfilter);
-
+       remove_proc_entry("nf_log", net->nf.proc_netfilter);
        return ret;
 }
 

diff --git a/net/socket.c b/net/socket.c
index 6b94633ca61d67e29faa58a7d42410e1ef678193..734194d3624268e30638c56564d6d20f582c5b4a 100644 (file)
--- 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