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>
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

View file

@ -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