[PATCH] ipv6: track device renames in snmp6

[PATCH] ipv6: track device renames in snmp6

[Stephen Hemminger]

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@linux-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;
 }
 

Re: [stable] [PATCH] ipv6: track device renames in snmp6

[Greg KH]

On Thu, Apr 26, 2007 at 04:42:47PM -0700, Stephen Hemminger wrote:
> 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@linux-foundation.org>

Which -stable is this for, 2.6.20 or 2.6.21?

thanks,

greg k-h

Re: [stable] [PATCH] ipv6: track device renames in snmp6

[Stephen Hemminger]

That patch I sent was against 2.6.21, but both 2.6.20 and 2.6.21 have
the problem.  Here is a version for 2.6.20.
=============================================

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@linux-foundation.org>


---
 net/ipv6/addrconf.c |    6 ++++--
 net/ipv6/proc.c     |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

--- linux-2.6.20.y.orig/net/ipv6/addrconf.c	2007-04-27 11:14:51.000000000 -0700
+++ linux-2.6.20.y/net/ipv6/addrconf.c	2007-04-27 11:16:26.000000000 -0700
@@ -2338,8 +2338,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,
@@ -2347,8 +2348,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.20.y.orig/net/ipv6/proc.c	2007-02-23 15:34:07.000000000 -0800
+++ linux-2.6.20.y/net/ipv6/proc.c	2007-04-27 11:16:26.000000000 -0700
@@ -237,6 +237,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;
 }