Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5632c515 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[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: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aad97f38

net/ipv6/addrconf.c

+4 −2
Original line number Diff line number Diff line
@@ -2359,8 +2359,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,
@@ -2368,8 +2369,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;

	}

net/ipv6/proc.c

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,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;

}