ipv6: clean up dev_snmp6 proc entry when we fail to initialize inet6_dev
authorSabrina Dubroca <sd@queasysnail.net>
Wed, 4 Nov 2015 13:47:53 +0000 (14:47 +0100)
committerDavid S. Miller <davem@davemloft.net>
Thu, 5 Nov 2015 04:49:48 +0000 (23:49 -0500)
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>
net/ipv6/addrconf.c

index d72fa90d6feb0122d15d68d6d862e5299d331008..d84742f003a9fca65a3545abdb7a4d517989ed4c 100644 (file)
@@ -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 */