diff options
| author | Benjamin Thery <benjamin.thery@bull.net> | 2008-11-19 14:07:41 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-19 14:07:41 -0800 |
| commit | c3e388964baa00d8c3960f23e8c8a1fb3966759e (patch) | |
| tree | 29014a69e1702a641bd782838050db47b7de9c19 /net | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
| download | linux-3.10-c3e388964baa00d8c3960f23e8c8a1fb3966759e.tar.gz linux-3.10-c3e388964baa00d8c3960f23e8c8a1fb3966759e.tar.bz2 linux-3.10-c3e388964baa00d8c3960f23e8c8a1fb3966759e.zip | |
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ipmr.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index b42e082cc17..25924b1eb2e 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -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; } |