diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2015-11-04 14:47:53 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-12-14 12:17:29 -0500 |
| commit | 8d135fedee7e84a0d7f4dc20919d40e40d71fb8c (patch) | |
| tree | f8774c8da5fff5039c2fb3853291229e61b544c7 /net | |
| parent | 725242ca67ab5fdba61e2026ff411e96a854ebe5 (diff) | |
| download | lwn-8d135fedee7e84a0d7f4dc20919d40e40d71fb8c.tar.gz lwn-8d135fedee7e84a0d7f4dc20919d40e40d71fb8c.zip | |
ipv6: clean up dev_snmp6 proc entry when we fail to initialize inet6_dev
[ Upstream commit 2a189f9e57650e9f310ddf4aad75d66c1233a064 ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/addrconf.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 17a025847999..3c321c2e2493 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -396,6 +396,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 */ |