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

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

net: bridge: mcast: fix stale ipv6 hdr pointer when handling v6 query 



[ Upstream commit 3b26a5d03d35d8f732d75951218983c0f7f68dff ]

We get a pointer to the ipv6 hdr in br_ip6_multicast_query but we may
call pskb_may_pull afterwards and end up using a stale pointer.
So use the header directly, it's just 1 place where it's needed.

Fixes: 08b202b6 ("bridge br_multicast: IPv6 MLD support.")
Signed-off-by: default avatarNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Tested-by: default avatarMartin Weinelt <martin@linuxlounge.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dddb75a1

net/bridge/br_multicast.c

+1 −2
Original line number Diff line number Diff line
@@ -1379,7 +1379,6 @@ static int br_ip6_multicast_query(struct net_bridge *br, 
				  struct sk_buff *skb,

				  u16 vid)

{

	const struct ipv6hdr *ip6h = ipv6_hdr(skb);

	struct mld_msg *mld;

	struct net_bridge_mdb_entry *mp;

	struct mld2_query *mld2q;
@@ -1423,7 +1422,7 @@ static int br_ip6_multicast_query(struct net_bridge *br, 


	if (is_general_query) {

		saddr.proto = htons(ETH_P_IPV6);

		saddr.u.ip6 = ip6h->saddr;

		saddr.u.ip6 = ipv6_hdr(skb)->saddr;



		br_multicast_query_received(br, port, &br->ip6_other_query,

					    &saddr, max_delay);