lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bridge: Fix return values of br_multicast_add_group/br_multicast_new_group

Browse Source 
If br_multicast_new_group returns NULL, we would return 0 (no error) to
the caller of br_multicast_add_group, which is not what we want. Instead
br_multicast_new_group should return ERR_PTR(-ENOMEM) in this case.
Also propagate the error number returned by br_mdb_rehash properly.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Tobias Klauser
2010-12-10 03:18:04 +00:00
committed by David S. Miller
parent eaa7dcde1d
commit 4c0833bcd4
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/bridge/br_multicast.c
View File

@@ -654,11 +654,13 @@ static struct net_bridge_mdb_entry *br_multicast_new_group(
struct net_bridge_mdb_htable *mdb; struct net_bridge_mdb_htable *mdb;
struct net_bridge_mdb_entry *mp; struct net_bridge_mdb_entry *mp;
int hash; int hash;
int err;
mdb = rcu_dereference_protected(br->mdb, 1); mdb = rcu_dereference_protected(br->mdb, 1);
if (!mdb) { if (!mdb) {
if (br_mdb_rehash(&br->mdb, BR_HASH_SIZE, 0)) err = br_mdb_rehash(&br->mdb, BR_HASH_SIZE, 0);
return NULL; if (err)
return ERR_PTR(err);
goto rehash; goto rehash;
} }
@@ -680,7 +682,7 @@ rehash:
mp = kzalloc(sizeof(*mp), GFP_ATOMIC); mp = kzalloc(sizeof(*mp), GFP_ATOMIC);
if (unlikely(!mp)) if (unlikely(!mp))
goto out; return ERR_PTR(-ENOMEM);
mp->br = br; mp->br = br;
mp->addr = *group; mp->addr = *group;
@@ -713,7 +715,7 @@ static int br_multicast_add_group(struct net_bridge *br,
mp = br_multicast_new_group(br, port, group); mp = br_multicast_new_group(br, port, group);
err = PTR_ERR(mp); err = PTR_ERR(mp);
if (unlikely(IS_ERR(mp) || !mp)) if (IS_ERR(mp))
goto err; goto err;
if (!port) { if (!port) {