Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[NETFILTER]: {arp,ip,ip6}_tables: proper error recovery in init path

Browse source 
Neither of {arp,ip,ip6}_tables cleans up behind itself when something goes
wrong during initialization.

Noticed by Rennie deGraaf <degraaf@cpsc.ucalgary.ca>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2006-08-13 18:57:28 -07:00 committed by David S. Miller
parent 7ee66fcb94
commit 0eff66e625
3 changed files with 70 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
net/ipv4/netfilter/arp_tables.c
View file

@ -1170,21 +1170,34 @@ static int __init arp_tables_init(void)
{ {
int ret; int ret;
xt_proto_init(NF_ARP); ret = xt_proto_init(NF_ARP);
if (ret < 0)
goto err1;
/* Noone else will be downing sem now, so we won't sleep */ /* Noone else will be downing sem now, so we won't sleep */
xt_register_target(&arpt_standard_target); ret = xt_register_target(&arpt_standard_target);
xt_register_target(&arpt_error_target); if (ret < 0)
goto err2;
ret = xt_register_target(&arpt_error_target);
if (ret < 0)
goto err3;
/* Register setsockopt */ /* Register setsockopt */
ret = nf_register_sockopt(&arpt_sockopts); ret = nf_register_sockopt(&arpt_sockopts);
if (ret < 0) { if (ret < 0)
duprintf("Unable to register sockopts.\n"); goto err4;
return ret;
}
printk("arp_tables: (C) 2002 David S. Miller\n"); printk("arp_tables: (C) 2002 David S. Miller\n");
return 0; return 0;
err4:
xt_unregister_target(&arpt_error_target);
err3:
xt_unregister_target(&arpt_standard_target);
err2:
xt_proto_fini(NF_ARP);
err1:
return ret;
} }
static void __exit arp_tables_fini(void) static void __exit arp_tables_fini(void)

33
net/ipv4/netfilter/ip_tables.c
View file

@ -2239,22 +2239,39 @@ static int __init ip_tables_init(void)
{ {
int ret; int ret;
xt_proto_init(AF_INET); ret = xt_proto_init(AF_INET);
if (ret < 0)
goto err1;
/* Noone else will be downing sem now, so we won't sleep */ /* Noone else will be downing sem now, so we won't sleep */
xt_register_target(&ipt_standard_target); ret = xt_register_target(&ipt_standard_target);
xt_register_target(&ipt_error_target); if (ret < 0)
xt_register_match(&icmp_matchstruct); goto err2;
ret = xt_register_target(&ipt_error_target);
if (ret < 0)
goto err3;
ret = xt_register_match(&icmp_matchstruct);
if (ret < 0)
goto err4;
/* Register setsockopt */ /* Register setsockopt */
ret = nf_register_sockopt(&ipt_sockopts); ret = nf_register_sockopt(&ipt_sockopts);
if (ret < 0) { if (ret < 0)
duprintf("Unable to register sockopts.\n"); goto err5;
return ret;
}
printk("ip_tables: (C) 2000-2006 Netfilter Core Team\n"); printk("ip_tables: (C) 2000-2006 Netfilter Core Team\n");
return 0; return 0;
err5:
xt_unregister_match(&icmp_matchstruct);
err4:
xt_unregister_target(&ipt_error_target);
err3:
xt_unregister_target(&ipt_standard_target);
err2:
xt_proto_fini(AF_INET);
err1:
return ret;
} }
static void __exit ip_tables_fini(void) static void __exit ip_tables_fini(void)

34
net/ipv6/netfilter/ip6_tables.c
View file

@ -1398,23 +1398,39 @@ static int __init ip6_tables_init(void)
{ {
int ret; int ret;
xt_proto_init(AF_INET6); ret = xt_proto_init(AF_INET6);
if (ret < 0)
goto err1;
/* Noone else will be downing sem now, so we won't sleep */ /* Noone else will be downing sem now, so we won't sleep */
xt_register_target(&ip6t_standard_target); ret = xt_register_target(&ip6t_standard_target);
xt_register_target(&ip6t_error_target); if (ret < 0)
xt_register_match(&icmp6_matchstruct); goto err2;
ret = xt_register_target(&ip6t_error_target);
if (ret < 0)
goto err3;
ret = xt_register_match(&icmp6_matchstruct);
if (ret < 0)
goto err4;
/* Register setsockopt */ /* Register setsockopt */
ret = nf_register_sockopt(&ip6t_sockopts); ret = nf_register_sockopt(&ip6t_sockopts);
if (ret < 0) { if (ret < 0)
duprintf("Unable to register sockopts.\n"); goto err5;
xt_proto_fini(AF_INET6);
return ret;
}
printk("ip6_tables: (C) 2000-2006 Netfilter Core Team\n"); printk("ip6_tables: (C) 2000-2006 Netfilter Core Team\n");
return 0; return 0;
err5:
xt_unregister_match(&icmp6_matchstruct);
err4:
xt_unregister_target(&ip6t_error_target);
err3:
xt_unregister_target(&ip6t_standard_target);
err2:
xt_proto_fini(AF_INET6);
err1:
return ret;
} }
static void __exit ip6_tables_fini(void) static void __exit ip6_tables_fini(void)