Skip to content

Commit 829fba2

Browse files
Nikolay Aleksandrovgregkh
authored andcommitted
net: bridge: mcast: fix stale ipv6 hdr pointer when handling v6 query
[ Upstream commit 3b26a5d ] 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: 08b202b ("bridge br_multicast: IPv6 MLD support.") Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Tested-by: Martin Weinelt <martin@linuxlounge.net> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent ad4350e commit 829fba2

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

net/bridge/br_multicast.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,7 +1353,6 @@ static int br_ip6_multicast_query(struct net_bridge *br,
13531353
struct sk_buff *skb,
13541354
u16 vid)
13551355
{
1356-
const struct ipv6hdr *ip6h = ipv6_hdr(skb);
13571356
struct mld_msg *mld;
13581357
struct net_bridge_mdb_entry *mp;
13591358
struct mld2_query *mld2q;
@@ -1397,7 +1396,7 @@ static int br_ip6_multicast_query(struct net_bridge *br,
13971396

13981397
if (is_general_query) {
13991398
saddr.proto = htons(ETH_P_IPV6);
1400-
saddr.u.ip6 = ip6h->saddr;
1399+
saddr.u.ip6 = ipv6_hdr(skb)->saddr;
14011400

14021401
br_multicast_query_received(br, port, &br->ip6_other_query,
14031402
&saddr, max_delay);

0 commit comments

Comments
 (0)