Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d11cfdb authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

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: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Acked-by: default avatarGao feng <gaofeng@cn.fujitsu.com>
parent 8bc14d25
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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
+15 −6
Original line number Diff line number Diff line
@@ -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;
}
+1 −4
Original line number Diff line number Diff line
@@ -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);

	return ret;
}

+3 −1
Original line number Diff line number Diff line
@@ -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