lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ipv6: Do cleanup for ip6_mr_init.

Browse Source 
If do not do it, we will get following issues:
1. Leaving junks after inet6_init failing halfway.
2. Leaving proc and notifier junks after ipv6 modules unloading.

Signed-off-by: Wang Chen <wangchen@cn.fujitsu.com>
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
This commit is contained in:
Wang Chen
2008-07-03 12:13:30 +08:00
committed by YOSHIFUJI Hideaki
parent dd3abc4ef5
commit 623d1a1af7
3 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/linux/mroute6.h
View File

@@ -135,7 +135,8 @@ extern int ip6_mroute_setsockopt(struct sock *, int, char __user *, int);
extern int ip6_mroute_getsockopt(struct sock *, int, char __user *, int __user *); extern int ip6_mroute_getsockopt(struct sock *, int, char __user *, int __user *);
extern int ip6_mr_input(struct sk_buff *skb); extern int ip6_mr_input(struct sk_buff *skb);
extern int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg); extern int ip6mr_ioctl(struct sock *sk, int cmd, void __user *arg);
extern void ip6_mr_init(void); extern int ip6_mr_init(void);
extern void ip6_mr_cleanup(void);
struct mif_device struct mif_device
{ {

11
net/ipv6/af_inet6.c
View File

@@ -953,7 +953,9 @@ static int __init inet6_init(void)
if (err) if (err)
goto icmp_fail; goto icmp_fail;
#ifdef CONFIG_IPV6_MROUTE #ifdef CONFIG_IPV6_MROUTE
ip6_mr_init(); err = ip6_mr_init();
if (err)
goto ipmr_fail;
#endif #endif
err = ndisc_init(); err = ndisc_init();
if (err) if (err)
@@ -1057,6 +1059,10 @@ netfilter_fail:
igmp_fail: igmp_fail:
ndisc_cleanup(); ndisc_cleanup();
ndisc_fail: ndisc_fail:
#ifdef CONFIG_IPV6_MROUTE
ip6_mr_cleanup();
ipmr_fail:
#endif
icmpv6_cleanup(); icmpv6_cleanup();
icmp_fail: icmp_fail:
unregister_pernet_subsys(&inet6_net_ops); unregister_pernet_subsys(&inet6_net_ops);
@@ -1111,6 +1117,9 @@ static void __exit inet6_exit(void)
ipv6_netfilter_fini(); ipv6_netfilter_fini();
igmp6_cleanup(); igmp6_cleanup();
ndisc_cleanup(); ndisc_cleanup();
#ifdef CONFIG_IPV6_MROUTE
ip6_mr_cleanup();
#endif
icmpv6_cleanup(); icmpv6_cleanup();
rawv6_exit(); rawv6_exit();

38
net/ipv6/ip6mr.c
View File

@@ -948,23 +948,51 @@ static struct notifier_block ip6_mr_notifier = {
* Setup for IP multicast routing * Setup for IP multicast routing
*/ */
void __init ip6_mr_init(void) int __init ip6_mr_init(void)
{ {
int err;
mrt_cachep = kmem_cache_create("ip6_mrt_cache", mrt_cachep = kmem_cache_create("ip6_mrt_cache",
sizeof(struct mfc6_cache), sizeof(struct mfc6_cache),
0, SLAB_HWCACHE_ALIGN, 0, SLAB_HWCACHE_ALIGN,
NULL); NULL);
if (!mrt_cachep) if (!mrt_cachep)
panic("cannot allocate ip6_mrt_cache"); return -ENOMEM;
setup_timer(&ipmr_expire_timer, ipmr_expire_process, 0); setup_timer(&ipmr_expire_timer, ipmr_expire_process, 0);
register_netdevice_notifier(&ip6_mr_notifier); err = register_netdevice_notifier(&ip6_mr_notifier);
if (err)
goto reg_notif_fail;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
proc_net_fops_create(&init_net, "ip6_mr_vif", 0, &ip6mr_vif_fops); err = -ENOMEM;
proc_net_fops_create(&init_net, "ip6_mr_cache", 0, &ip6mr_mfc_fops); if (!proc_net_fops_create(&init_net, "ip6_mr_vif", 0, &ip6mr_vif_fops))
goto proc_vif_fail;
if (!proc_net_fops_create(&init_net, "ip6_mr_cache",
0, &ip6mr_mfc_fops))
goto proc_cache_fail;
#endif #endif
return 0;
reg_notif_fail:
kmem_cache_destroy(mrt_cachep);
#ifdef CONFIG_PROC_FS
proc_vif_fail:
unregister_netdevice_notifier(&ip6_mr_notifier);
proc_cache_fail:
proc_net_remove(&init_net, "ip6_mr_vif");
#endif
return err;
} }
void ip6_mr_cleanup(void)
{
#ifdef CONFIG_PROC_FS
proc_net_remove(&init_net, "ip6_mr_cache");
proc_net_remove(&init_net, "ip6_mr_vif");
#endif
unregister_netdevice_notifier(&ip6_mr_notifier);
del_timer(&ipmr_expire_timer);
kmem_cache_destroy(mrt_cachep);
}
static int ip6mr_mfc_add(struct mf6cctl *mfc, int mrtsock) static int ip6mr_mfc_add(struct mf6cctl *mfc, int mrtsock)
{ {