summaryrefslogtreecommitdiffstats
path: root/net/ipv6
diff options
context:
space:
mode:
authorSabrina Dubroca <sd@queasysnail.net>2015-11-04 14:47:53 +0100
committerDavid S. Miller <davem@davemloft.net>2015-11-04 23:49:48 -0500
commit2a189f9e57650e9f310ddf4aad75d66c1233a064 (patch)
tree17c6ae06a11ef65498f8bddf246516fe39477288 /net/ipv6
parent87aec47d173ca730d014b6b0246ca6be18b0ce94 (diff)
downloadtalos-op-linux-2a189f9e57650e9f310ddf4aad75d66c1233a064.tar.gz
talos-op-linux-2a189f9e57650e9f310ddf4aad75d66c1233a064.zip
ipv6: clean up dev_snmp6 proc entry when we fail to initialize inet6_dev
In ipv6_add_dev, when addrconf_sysctl_register fails, we do not clean up the dev_snmp6 entry that we have already registered for this device. Call snmp6_unregister_dev in this case. Fixes: a317a2f19da7d ("ipv6: fail early when creating netdev named all or default") Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Sabrina Dubroca <sd@queasysnail.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r--net/ipv6/addrconf.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index d72fa90d6feb..d84742f003a9 100644
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -418,6 +418,7 @@ static struct inet6_dev *ipv6_add_dev(struct net_device *dev)
if (err) {
ipv6_mc_destroy_dev(ndev);
del_timer(&ndev->regen_timer);
+ snmp6_unregister_dev(ndev);
goto err_release;
}
/* protected by rtnl_lock */
OpenPOWER on IntegriCloud