net: Fix dev_mc_add()

Commit 6e17d45a (net: add addr len check to dev_mc_add)
added a bug in dev_mc_add(), since it can now exit with a lock
imbalance.

Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index fd91569e2394b0b37caada596af21b29a5e2df3b..3dc295beb48316363175c1fa3701c19aef770f0c 100644 (file)
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -97,8 +97,9 @@ int dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl)
 
        netif_addr_lock_bh(dev);
        if (alen != dev->addr_len)
-               return -EINVAL;
-       err = __dev_addr_add(&dev->mc_list, &dev->mc_count, addr, alen, glbl);
+               err = -EINVAL;
+       else
+               err = __dev_addr_add(&dev->mc_list, &dev->mc_count, addr, alen, glbl);
        if (!err)
                __dev_set_rx_mode(dev);
        netif_addr_unlock_bh(dev);