Commit c3e38896 authored Nov 19, 2008 by Benjamin Thery Committed by David S. Miller Nov 19, 2008

net: fix ip_mr_init() error path



Similarly to IPv6 ip6_mr_init() (fixed last week), the order of cleanup
operations in the error/exit section of ip_mr_init() is completely 
inversed. It should be the other way around.
Also a del_timer() is missing in the error path.

I should have guessed last week that this same error existed in ipmr.c
too, as ip6mr.c is largely inspired by ipmr.c.

Signed-off-by: Benjamin Thery <benjamin.thery@bull.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 7f0f598a

net/ipv4/ipmr.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -1945,13 +1945,14 @@ int __init ip_mr_init(void)
		goto proc_cache_fail;
		#endif
		return 0;
		reg_notif_fail:
		kmem_cache_destroy(mrt_cachep);
		#ifdef CONFIG_PROC_FS
		proc_vif_fail:
		unregister_netdevice_notifier(&ip_mr_notifier);
		proc_cache_fail:
		proc_net_remove(&init_net, "ip_mr_vif");
		proc_vif_fail:
		unregister_netdevice_notifier(&ip_mr_notifier);
		#endif
		reg_notif_fail:
		del_timer(&ipmr_expire_timer);
		kmem_cache_destroy(mrt_cachep);
		return err;
		}

Admin message