Patch "Bridge: Fix ipv6 mc snooping if bridge has no ipv6 address" has been added to the 4.6-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
Bridge: Fix ipv6 mc snooping if bridge has no ipv6 address
to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
bridge-fix-ipv6-mc-snooping-if-bridge-has-no-ipv6-address.patch
and it can be found in the queue-4.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From foo@baz Wed Jul 6 16:50:56 PDT 2016
From: daniel <[email protected]>
Date: Fri, 24 Jun 2016 12:35:18 +0200
Subject: Bridge: Fix ipv6 mc snooping if bridge has no ipv6 address
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: daniel <[email protected]>
[ Upstream commit 0888d5f3c0f183ea6177355752ada433d370ac89 ]
The bridge is falsly dropping ipv6 mulitcast packets if there is:
1. No ipv6 address assigned on the brigde.
2. No external mld querier present.
3. The internal querier enabled.
When the bridge fails to build mld queries, because it has no ipv6 address, it slilently returns, but keeps the local querier enabled. This specific case causes confusing packet loss.
Ipv6 multicast snooping can only work if:
a) An external querier is present
OR
b) The bridge has an ipv6 address an is capable of sending own queries
Otherwise it has to forward/flood the ipv6 multicast traffic, because snooping cannot work.
This patch fixes the issue by adding a flag to the bridge struct that indicates that there is currently no ipv6 address assinged to the bridge and returns a false state for the local querier in __br_multicast_querier_exists().
Special thanks to Linus Lüssing.
--- net/bridge/br_multicast.c | 4 ++++ net/bridge/br_private.h | 23 +++++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-)
net/bridge/br_multicast.c +4 -0
@@ -464,8 +464,11 @@ static struct sk_buff *br_ip6_multicast_if (ipv6_dev_get_saddr (dev_net (br->dev), br->dev, &ip6h->daddr,0 , &ip6h->saddr)) {kfree_skb (skb); + br->has_ipv6_addr =0 ;return NULL ; } + + br->has_ipv6_addr =1 ;ipv6_eth_mc_map (&ip6h->daddr, eth->h_dest); hopopt = (u8 *)(ip6h +1 );
@@ -1745,6 +1748,7 @@ void br_multicast_init(struct net_bridge br->ip6_other_query.delay_time =0 ; br->ip6_querier.port =NULL ;#endif + br->has_ipv6_addr =1 ;spin_lock_init (&br->multicast_lock); setup_timer(&br->multicast_router_timer,
net/bridge/br_private.h +19 -4
@@ -304,6 +304,7 @@ struct net_bridge u8 multicast_disabled:1; u8 multicast_querier:1; u8 multicast_query_use_ifaddr:1; + u8 has_ipv6_addr:1;u32 hash_elasticity;u32 hash_max;
@@ -577,10 +578,22 @@ static inline bool br_multicast_is_routestatic inline bool __br_multicast_querier_exists (struct net_bridge *br, -struct bridge_mcast_other_query *querier) +struct bridge_mcast_other_query *querier, +const bool is_ipv6) { +bool own_querier_enabled; + +if (br->multicast_querier) { +if (is_ipv6 && !br->has_ipv6_addr) + own_querier_enabled = false; +else + own_querier_enabled = true; + }else { + own_querier_enabled = false; + } +return time_is_before_jiffies (querier->delay_time) && - (br->multicast_querier ||timer_pending (&querier->timer)); + (own_querier_enabled ||timer_pending (&querier->timer)); } static inline bool br_multicast_querier_exists(struct net_bridge *br,
@@ -588,10 +601,12 @@ static inline bool br_multicast_querier_ {switch (eth->h_proto) {case (htons (ETH_P_IP )): -return __br_multicast_querier_exists (br, &br->ip4_other_query); +return __br_multicast_querier_exists (br, + &br->ip4_other_query, false);#if IS_ENABLED (CONFIG_IPV6 )case (htons (ETH_P_IPV6 )): -return __br_multicast_querier_exists (br, &br->ip6_other_query); +return __br_multicast_querier_exists (br, + &br->ip6_other_query, true);#endif default :return false;
Patches currently in stable-queue which might be from [email protected] are
queue-4.6/bridge-fix-ipv6-mc-snooping-if-bridge-has-no-ipv6-address.patch