From: Stephen Hemminger Date: Thu, 26 Apr 2007 23:42:47 +0000 (-0700) Subject: [PATCH] ipv6: track device renames in snmp6 X-Git-Tag: v2.6.21.2~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55c2dacf601472524839376e2864c61fd8b9e0bd;p=thirdparty%2Fkernel%2Fstable.git [PATCH] ipv6: track device renames in snmp6 When network device's are renamed, the IPV6 snmp6 code gets confused. It doesn't track name changes so it will OOPS when network device's are removed. The fix is trivial, just unregister/re-register in notify handler. Signed-off-by: Stephen Hemminger Signed-off-by: Chris Wright --- diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 452a82ce47968..9b1ec9714ad6b 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -2281,8 +2281,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, break; case NETDEV_CHANGENAME: -#ifdef CONFIG_SYSCTL if (idev) { + snmp6_unregister_dev(idev); +#ifdef CONFIG_SYSCTL addrconf_sysctl_unregister(&idev->cnf); neigh_sysctl_unregister(idev->nd_parms); neigh_sysctl_register(dev, idev->nd_parms, @@ -2290,8 +2291,9 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, &ndisc_ifinfo_sysctl_change, NULL); addrconf_sysctl_register(idev, &idev->cnf); - } #endif + snmp6_register_dev(idev); + } break; }; diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c index fa3fb509f1877..d57853daf8742 100644 --- a/net/ipv6/proc.c +++ b/net/ipv6/proc.c @@ -236,6 +236,7 @@ int snmp6_unregister_dev(struct inet6_dev *idev) return -EINVAL; remove_proc_entry(idev->stats.proc_dir_entry->name, proc_net_devsnmp6); + idev->stats.proc_dir_entry = NULL; return 0; }