summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-03-09 19:09:08 +0000
committerDavid S. Miller <davem@davemloft.net>2010-03-10 07:32:28 -0800
commit3041f5170751e3522aa1bd6e8ca5d98e846720b0 (patch)
treef692b5193501ff8d3f6895321f936895980e6761 /net/core
parent0a141509ede48ac33ef756ac1640f4d3f46fa2db (diff)
downloadop-kernel-dev-3041f5170751e3522aa1bd6e8ca5d98e846720b0.zip
op-kernel-dev-3041f5170751e3522aa1bd6e8ca5d98e846720b0.tar.gz
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>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev_mcast.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index fd91569..3dc295b 100644
--- 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);
OpenPOWER on IntegriCloud