From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3EE77C32750 for ; Fri, 2 Aug 2019 09:47:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CD0420880 for ; Fri, 2 Aug 2019 09:47:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739250; bh=NNRDplPKVWxRB5lwH3Z2zjZpvOOx1czUX2WfBcdDDKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iq2eIk/5ga9IrUeeGctblXpPj528bgdwvhGImDrxvpZ3LH51FIAo6pVUkVuVsbDHI FTD6hrbVp8E2BsjBYuUm87hH9ELF6GYDLqHvOdKOiyzalNyJzO9psCas0f4O6oVJMD c/YPaIOgCz+S7j3sVyNQSAKtnjLku/aH5HWmoI9g= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405685AbfHBJr2 (ORCPT ); Fri, 2 Aug 2019 05:47:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:52260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405660AbfHBJr0 (ORCPT ); Fri, 2 Aug 2019 05:47:26 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9826921726; Fri, 2 Aug 2019 09:47:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739245; bh=NNRDplPKVWxRB5lwH3Z2zjZpvOOx1czUX2WfBcdDDKE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j2J8oZ9CQnsUMvbkHFRRhit6Yaol1ZNIaqR2Lg6Eu+8ShFyxQkBFFJw6dKK0CMezu FINoXNodwm7PgMk3+YugvErNVqv8nRyPyJBeG0HPFboO5eM232Dj0LGCflLuKlKJpS x1ZeKlwTH6RJpPIM48eFlWnKcIw6IoQlinYIrmr4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Aleksandrov , Martin Weinelt , "David S. Miller" Subject: [PATCH 4.9 149/223] net: bridge: mcast: fix stale ipv6 hdr pointer when handling v6 query Date: Fri, 2 Aug 2019 11:36:14 +0200 Message-Id: <20190802092248.165485757@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802092238.692035242@linuxfoundation.org> References: <20190802092238.692035242@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nikolay Aleksandrov [ 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: 08b202b67264 ("bridge br_multicast: IPv6 MLD support.") Signed-off-by: Nikolay Aleksandrov Tested-by: Martin Weinelt Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/bridge/br_multicast.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1379,7 +1379,6 @@ static int br_ip6_multicast_query(struct 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 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);