summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Luis Vázquez Cao <fernando@oss.ntt.co.jp>2011-06-13 15:06:58 +0000
committerAndi Kleen <ak@linux.intel.com>2011-08-01 13:55:04 -0700
commitef0c3e7d6e082b7f3cf41546525c84f4477a76d3 (patch)
tree06e266514132d220e0ce8180d786775250f27aa3
parent8904f07a1b5683c4363b225cb376f2bd1435246f (diff)
downloadlinux-stable-ef0c3e7d6e082b7f3cf41546525c84f4477a76d3.tar.gz
linux-stable-ef0c3e7d6e082b7f3cf41546525c84f4477a76d3.tar.bz2
linux-stable-ef0c3e7d6e082b7f3cf41546525c84f4477a76d3.zip
IGMP snooping: set mrouters_only flag for IPv6 traffic
[ upstream commit fc2af6c73fc9449cd5894a36bb76b8f8c0e49fd8 ] properly Upon reception of a MGM report packet the kernel sets the mrouters_only flag in a skb that is a clone of the original skb, which means that the bridge loses track of MGM packets (cb buffers are tied to a specific skb and not shared) and it ends up forwading join requests to the bridge interface. This can cause unexpected membership timeouts and intermitent/permanent loss of connectivity as described in RFC 4541 [2.1.1. IGMP Forwarding Rules]: A snooping switch should forward IGMP Membership Reports only to those ports where multicast routers are attached. [...] Sending membership reports to other hosts can result, for IGMPv1 and IGMPv2, in unintentionally preventing a host from joining a specific multicast group. Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp> Signed-off-by: David S. Miller <davem@conan.davemloft.net> Signed-off-by: Andi Kleen <ak@linux.intel.com>
-rw-r--r--net/bridge/br_multicast.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 7ab8ad30adcd..382a4288c518 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1517,7 +1517,7 @@ static int br_multicast_ipv6_rcv(struct net_bridge *br,
case ICMPV6_MGM_REPORT:
{
struct mld_msg *mld = (struct mld_msg *)icmp6h;
- BR_INPUT_SKB_CB(skb2)->mrouters_only = 1;
+ BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
err = br_ip6_multicast_add_group(br, port, &mld->mld_mca);
break;
}