[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20070426164247.3b3b2c7a@freekitty>
Date: Thu, 26 Apr 2007 16:42:47 -0700
From: Stephen Hemminger <shemminger@...ux-foundation.org>
To: 吉藤英明 <yoshfuji@...ux-ipv6.org>,
"David S. Miller" <davem@...emloft.net>
Cc: netdev@...r.kernel.org, stable@...nel.org
Subject: [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 <shemminger@...ux-foundation.org>
---
net/ipv6/addrconf.c | 6 ++++--
net/ipv6/proc.c | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
--- linux-2.6.orig/net/ipv6/addrconf.c 2007-04-25 10:19:07.000000000 -0700
+++ linux-2.6/net/ipv6/addrconf.c 2007-04-26 16:37:36.000000000 -0700
@@ -2281,8 +2281,9 @@ static int addrconf_notify(struct notifi
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 notifi
&ndisc_ifinfo_sysctl_change,
NULL);
addrconf_sysctl_register(idev, &idev->cnf);
- }
#endif
+ snmp6_register_dev(idev);
+ }
break;
};
--- linux-2.6.orig/net/ipv6/proc.c 2007-04-10 10:11:19.000000000 -0700
+++ linux-2.6/net/ipv6/proc.c 2007-04-26 16:37:36.000000000 -0700
@@ -236,6 +236,7 @@ int snmp6_unregister_dev(struct inet6_de
return -EINVAL;
remove_proc_entry(idev->stats.proc_dir_entry->name,
proc_net_devsnmp6);
+ idev->stats.proc_dir_entry = NULL;
return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists