Commit 68fffc67 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by David S. Miller
Browse files

ipv6: clean up ip6_route_net_init() error handling 



ip6_route_net_init() error handling looked less than solid, fix 'er up.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 23542618

net/ipv6/route.c

+10 −9
Original line number Diff line number Diff line
@@ -2631,10 +2631,8 @@ static int ip6_route_net_init(struct net *net) 
	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template,

					       sizeof(*net->ipv6.ip6_prohibit_entry),

					       GFP_KERNEL);

	if (!net->ipv6.ip6_prohibit_entry) {

		kfree(net->ipv6.ip6_null_entry);

		goto out;

	}

	if (!net->ipv6.ip6_prohibit_entry)

		goto out_ip6_null_entry;

	net->ipv6.ip6_prohibit_entry->u.dst.path =

		(struct dst_entry *)net->ipv6.ip6_prohibit_entry;

	net->ipv6.ip6_prohibit_entry->u.dst.ops = net->ipv6.ip6_dst_ops;
@@ -2642,11 +2640,8 @@ static int ip6_route_net_init(struct net *net) 
	net->ipv6.ip6_blk_hole_entry = kmemdup(&ip6_blk_hole_entry_template,

					       sizeof(*net->ipv6.ip6_blk_hole_entry),

					       GFP_KERNEL);

	if (!net->ipv6.ip6_blk_hole_entry) {

		kfree(net->ipv6.ip6_null_entry);

		kfree(net->ipv6.ip6_prohibit_entry);

		goto out;

	}

	if (!net->ipv6.ip6_blk_hole_entry)

		goto out_ip6_prohibit_entry;

	net->ipv6.ip6_blk_hole_entry->u.dst.path =

		(struct dst_entry *)net->ipv6.ip6_blk_hole_entry;

	net->ipv6.ip6_blk_hole_entry->u.dst.ops = net->ipv6.ip6_dst_ops;
@@ -2662,6 +2657,12 @@ static int ip6_route_net_init(struct net *net) 
out:

	return ret;



#ifdef CONFIG_IPV6_MULTIPLE_TABLES

out_ip6_prohibit_entry:

	kfree(net->ipv6.ip6_prohibit_entry);

out_ip6_null_entry:

	kfree(net->ipv6.ip6_null_entry);

#endif

out_ip6_dst_ops:

	release_net(net->ipv6.ip6_dst_ops->dst_net);

	kfree(net->ipv6.ip6_dst_ops);