Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0821ec55 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

bridge: Move NULL mdb check into br_mdb_ip_get 



Since all callers of br_mdb_ip_get need to check whether the
hash table is NULL, this patch moves the check into the function.

This fixes the two callers (query/leave handler) that didn't
check it.

Reported-by: default avatarMichael Braun <michael-dev@fami-braun.de>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d00561a2

net/bridge/br_multicast.c

+5 −4
Original line number Diff line number Diff line
@@ -49,22 +49,23 @@ static struct net_bridge_mdb_entry *__br_mdb_ip_get( 
static struct net_bridge_mdb_entry *br_mdb_ip_get(

	struct net_bridge_mdb_htable *mdb, __be32 dst)

{

	if (!mdb)

		return NULL;



	return __br_mdb_ip_get(mdb, dst, br_ip_hash(mdb, dst));

}



struct net_bridge_mdb_entry *br_mdb_get(struct net_bridge *br,

					struct sk_buff *skb)

{

	struct net_bridge_mdb_htable *mdb = br->mdb;



	if (!mdb || br->multicast_disabled)

	if (br->multicast_disabled)

		return NULL;



	switch (skb->protocol) {

	case htons(ETH_P_IP):

		if (BR_INPUT_SKB_CB(skb)->igmp)

			break;

		return br_mdb_ip_get(mdb, ip_hdr(skb)->daddr);

		return br_mdb_ip_get(br->mdb, ip_hdr(skb)->daddr);

	}



	return NULL;