Patch "bridge: do not add port to router list when receives query with source 0.0.0.0" has been added to the 4.19-stable tree

This is a note to let you know that I've just added the patch titled

bridge: do not add port to router list when receives query with source 0.0.0.0

to the 4.19-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-do-not-add-port-to-router-list-when-receives-query-with-source-0.0.0.0.patch

and it can be found in the queue-4.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From foo@baz Fri Nov 2 06:12:28 CET 2018
From: Hangbin Liu <[email protected]>
Date: Fri, 26 Oct 2018 10:28:43 +0800
Subject: bridge: do not add port to router list when receives query with source 0.0.0.0

From: Hangbin Liu <[email protected]>

[ Upstream commit 5a2de63fd1a59c30c02526d427bc014b98adf508 ]

Based on RFC 4541, 2.1.1. IGMP Forwarding Rules

The switch supporting IGMP snooping must maintain a list of multicast routers and the ports on which they are attached. This list can be constructed in any combination of the following ways:

a) This list should be built by the snooping switch sending Multicast Router Solicitation messages as described in IGMP Multicast Router Discovery [MRDISC]. It may also snoop Multicast Router Advertisement messages sent by and to other nodes.

b) The arrival port for IGMP Queries (sent by multicast routers) where the source address is not 0.0.0.0.

We should not add the port to router list when receives query with source 0.0.0.0.

Reported-by Ying Xu <[email protected]>

Signed-off-by Hangbin Liu <[email protected]>

Acked-by Nikolay Aleksandrov <[email protected]>

Acked-by Roopa Prabhu <[email protected]>

Signed-off-by David S. Miller <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 net/bridge/br_multicast.c |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

net/bridge/br_multicast.c +9 -1

@@ -1420,7 +1420,15 @@ static void br_multicast_query_received(
 		return;
 
 	br_multicast_update_query_timer(br, query, max_delay);
-	br_multicast_mark_router(br, port);
+
+	/* Based on RFC4541, section 2.1.1 IGMP Forwarding Rules,
+	 * the arrival port for IGMP Queries where the source address
+	 * is 0.0.0.0 should not be added to router port list.
+	 */
+	if ((saddr->proto == htons(ETH_P_IP) && saddr->u.ip4) ||
+	    (saddr->proto == htons(ETH_P_IPV6) &&
+	     !ipv6_addr_any(&saddr->u.ip6)))
+		br_multicast_mark_router(br, port);
 }
 
 static void br_ip4_multicast_query(struct net_bridge *br,

Patches currently in stable-queue which might be from [email protected] are

queue-4.19/bridge-do-not-add-port-to-router-list-when-receives-query-with-source-0.0.0.0.patch

Quoted 8 lines

This is a note to let you know that I've just added the patch titled

bridge: do not add port to router list when receives query with source 0.0.0.0

to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Quoted 6 lines

The filename of the patch is:

     bridge-do-not-add-port-to-router-list-when-receives-query-with-source-0.0.0.0.patch

and it can be found in the queue-4.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Hi,

Patch

commit 0fe5119e267f3e3d8ac206895f5922195ec55a8a

Author: Nikolay Aleksandrov <[email protected]>
Date:   Sat Oct 27 12:07:47 2018 +0300

net: bridge: remove ipv6 zero address check in mcast queries

is also needed to fix this patch.