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

Commit 1fafc7a9 authored by YOSHIFUJI Hideaki / 吉藤英明's avatar YOSHIFUJI Hideaki / 吉藤英明 Committed by David S. Miller
Browse files

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/MLD snooping support is
compiled and disabled, so we can see garbage.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a4771a5

net/bridge/br_multicast.c

+3 −6
Original line number Diff line number Diff line
@@ -1340,9 +1340,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;
@@ -1440,9 +1437,6 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br, 
	unsigned offset;

	int err;



	BR_INPUT_SKB_CB(skb)->igmp = 0;

	BR_INPUT_SKB_CB(skb)->mrouters_only = 0;



	if (!pskb_may_pull(skb, sizeof(*ip6h)))

		return -EINVAL;
@@ -1550,6 +1544,9 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br, 
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;