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

Commit 36cff5a1 authored by Linus Lüssing's avatar Linus Lüssing Committed by David S. Miller
Browse files

bridge: Fix MLD queries' ethernet source address 



Map the IPv6 header's destination multicast address to an ethernet
source address instead of the MLD queries multicast address.

For instance for a general MLD query (multicast address in the MLD query
set to ::), this would wrongly be mapped to 33:33:00:00:00:00, although
an MLD queries destination MAC should always be 33:33:00:00:00:01 which
matches the IPv6 header's multicast destination ff02::1.

Signed-off-by: default avatarLinus Lüssing <linus.luessing@web.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e4de9f9e

net/bridge/br_multicast.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -434,7 +434,6 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, 
	eth = eth_hdr(skb);

	eth = eth_hdr(skb);





	memcpy(eth->h_source, br->dev->dev_addr, 6);

	memcpy(eth->h_source, br->dev->dev_addr, 6);

	ipv6_eth_mc_map(group, eth->h_dest);

	eth->h_proto = htons(ETH_P_IPV6);

	eth->h_proto = htons(ETH_P_IPV6);

	skb_put(skb, sizeof(*eth));

	skb_put(skb, sizeof(*eth));
@@ -448,6 +447,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge *br, 
	ip6h->hop_limit = 1;

	ip6h->hop_limit = 1;

	ipv6_addr_set(&ip6h->saddr, 0, 0, 0, 0);

	ipv6_addr_set(&ip6h->saddr, 0, 0, 0, 0);

	ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));

	ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));

	ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);





	hopopt = (u8 *)(ip6h + 1);

	hopopt = (u8 *)(ip6h + 1);

	hopopt[0] = IPPROTO_ICMPV6;		/* next hdr */

	hopopt[0] = IPPROTO_ICMPV6;		/* next hdr */