bridge br_multicast: BUG: unable to handle kernel NULL pointer dereference

Message ID
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Herbert Xu July 6, 2010, 12:48 a.m.
On Mon, Jul 05, 2010 at 09:05:37PM +0200, Frank Arnold wrote:
> Hi,
> we see a kernel NULL pointer dereference during testing of the KVM tree,
> currently based on 2.6.35-rc3. We are using bridge to connect the KVM
> guests through the hosts network interface. Here is the trace:
> BUG: unable to handle kernel NULL pointer dereference at
> 0000000000000028                                               
> IP: [<ffffffffa0196da0>] __br_ip4_hash+0x0/0x7c [bridge]                                                                

Thanks for the report! Luckily this bug was introduced after
2.6.34 so we don't need it in stable.

bridge: Restore NULL check in br_mdb_ip_get

Somewhere along the line the NULL check in br_mdb_ip_get went
AWOL, causing crashes when we receive an IGMP packet with no
multicast table allocated.

This patch restores it and ensures all br_mdb_*_get functions
use it.

Signed-off-by: Herbert Xu <>



diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 9d21d98..27ae946 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -99,6 +99,15 @@  static struct net_bridge_mdb_entry *__br_mdb_ip_get(
 	return NULL;
+static struct net_bridge_mdb_entry *br_mdb_ip_get(
+	struct net_bridge_mdb_htable *mdb, struct br_ip *dst)
+	if (!mdb)
+		return NULL;
+	return __br_mdb_ip_get(mdb, dst, br_ip_hash(mdb, dst));
 static struct net_bridge_mdb_entry *br_mdb_ip4_get(
 	struct net_bridge_mdb_htable *mdb, __be32 dst)
@@ -107,7 +116,7 @@  static struct net_bridge_mdb_entry *br_mdb_ip4_get(
 	br_dst.u.ip4 = dst;
 	br_dst.proto = htons(ETH_P_IP);
-	return __br_mdb_ip_get(mdb, &br_dst, __br_ip4_hash(mdb, dst));
+	return br_mdb_ip_get(mdb, &br_dst);
 #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -119,23 +128,17 @@  static struct net_bridge_mdb_entry *br_mdb_ip6_get(
 	ipv6_addr_copy(&br_dst.u.ip6, dst);
 	br_dst.proto = htons(ETH_P_IPV6);
-	return __br_mdb_ip_get(mdb, &br_dst, __br_ip6_hash(mdb, dst));
+	return br_mdb_ip_get(mdb, &br_dst);
-static struct net_bridge_mdb_entry *br_mdb_ip_get(
-	struct net_bridge_mdb_htable *mdb, struct br_ip *dst)
-	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;
 	struct br_ip ip;
-	if (!mdb || br->multicast_disabled)
+	if (br->multicast_disabled)
 		return NULL;
 	if (BR_INPUT_SKB_CB(skb)->igmp)