Commit 4eb8b903 authored Apr 25, 2010 by YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller Apr 26, 2010

bridge br_multicast: Ensure to initialize BR_INPUT_SKB_CB(skb)->mrouters_only.



Even with commit 32dec5dd ("bridge
br_multicast: Don't refer to BR_INPUT_SKB_CB(skb)->mrouters_only
without IGMP snooping."), BR_INPUT_SKB_CB(skb)->mrouters_only is
not appropriately initialized if IGMP snooping support is
compiled and disabled, so we can see garbage.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 93c0c8b4

net/bridge/br_multicast.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -957,9 +957,6 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
		unsigned offset;
		int err;

		BR_INPUT_SKB_CB(skb)->igmp = 0;
		BR_INPUT_SKB_CB(skb)->mrouters_only = 0;

		/* We treat OOM as packet loss for now. */
		if (!pskb_may_pull(skb, sizeof(*iph)))
		return -EINVAL;
		@@ -1049,6 +1046,9 @@ err_out:
		int br_multicast_rcv(struct net_bridge br, struct net_bridge_port port,
		struct sk_buff *skb)
		{
		BR_INPUT_SKB_CB(skb)->igmp = 0;
		BR_INPUT_SKB_CB(skb)->mrouters_only = 0;

		if (br->multicast_disabled)
		return 0;