android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Pablo Neira Ayuso 2013-05-22 22:42:36 +00:00
parent 8bc14d25ff
commit 6d11cfdba5
4 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/netfilter.h
View File

@ -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]; result->all[3] = a1->all[3] & mask->all[3];
} }
extern void netfilter_init(void); extern int netfilter_init(void);
/* Largest hook number + 1 */ /* Largest hook number + 1 */
#define NF_MAX_HOOKS 8 #define NF_MAX_HOOKS 8

21
net/netfilter/core.c
View File

@ -302,17 +302,26 @@ static struct pernet_operations netfilter_net_ops = {
.exit = netfilter_net_exit, .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 (i = 0; i < ARRAY_SIZE(nf_hooks); i++) {
for (h = 0; h < NF_MAX_HOOKS; h++) for (h = 0; h < NF_MAX_HOOKS; h++)
INIT_LIST_HEAD(&nf_hooks[i][h]); INIT_LIST_HEAD(&nf_hooks[i][h]);
} }
if (register_pernet_subsys(&netfilter_net_ops) < 0) ret = register_pernet_subsys(&netfilter_net_ops);
panic("cannot create netfilter proc entry"); if (ret < 0)
goto err;
if (netfilter_log_init() < 0) ret = netfilter_log_init();
panic("cannot initialize nf_log"); if (ret < 0)
goto err_pernet;
return 0;
err_pernet:
unregister_pernet_subsys(&netfilter_net_ops);
err:
return ret;
} }

5
net/netfilter/nf_log.c
View File

@ -368,10 +368,7 @@ static int __net_init nf_log_net_init(struct net *net)
return 0; return 0;
out_sysctl: out_sysctl:
/* For init_net: errors will trigger panic, don't unroll on error. */ remove_proc_entry("nf_log", net->nf.proc_netfilter);
if (!net_eq(net, &init_net))
remove_proc_entry("nf_log", net->nf.proc_netfilter);
return ret; return ret;
} }

4
net/socket.c
View File

@ -2612,7 +2612,9 @@ static int __init sock_init(void)
*/ */
#ifdef CONFIG_NETFILTER #ifdef CONFIG_NETFILTER
netfilter_init(); err = netfilter_init();
if (err)
goto out;
#endif #endif
#ifdef CONFIG_NETWORK_PHY_TIMESTAMPING #ifdef CONFIG_NETWORK_PHY_TIMESTAMPING