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

Commit c6819700 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by Greg Kroah-Hartman
Browse files

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



commit 0fe5119e267f3e3d8ac206895f5922195ec55a8a upstream.

Recently a check was added which prevents marking of routers with zero
source address, but for IPv6 that cannot happen as the relevant RFCs
actually forbid such packets:
RFC 2710 (MLDv1):
"To be valid, the Query message MUST
 come from a link-local IPv6 Source Address, be at least 24 octets
 long, and have a correct MLD checksum."

Same goes for RFC 3810.

And also it can be seen as a requirement in ipv6_mc_check_mld_query()
which is used by the bridge to validate the message before processing
it. Thus any queries with :: source address won't be processed anyway.
So just remove the check for zero IPv6 source address from the query
processing function.

Fixes: 5a2de63fd1a5 ("bridge: do not add port to router list when receives query with source 0.0.0.0")
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Hangbin Liu <liuhangbin@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 63383315

net/bridge/br_multicast.c

+1 −2
Original line number Diff line number Diff line
@@ -1426,8 +1426,7 @@ static void br_multicast_query_received(struct net_bridge *br, 
	 * 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)))

	    saddr->proto == htons(ETH_P_IPV6))

		br_multicast_mark_router(br, port);

}