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 079E1C32750 for ; Fri, 2 Aug 2019 09:47:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9FF120880 for ; Fri, 2 Aug 2019 09:47:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739260; bh=mU/cphH8ryHrVmuO9omVALk2fgtD/LhRfsJrntv7E2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r7F4F1QVa3FskSzuCgvz51w6r09zakVMJCshLO/MFTwXDQBYWbdDGSSJYttyUCKxJ arO+rBqbXuC6502VQ7AZOht+rIy7txT6OQdrunQH0rpBeNYBZK7fIkZ8HkpYqBs+PD cd0KdQujfLl3HguZe9QJGnxyCbzVZkWSpZ+YcM5A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2405706AbfHBJrj (ORCPT ); Fri, 2 Aug 2019 05:47:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:52482 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405693AbfHBJrf (ORCPT ); Fri, 2 Aug 2019 05:47:35 -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 8081D2086A; Fri, 2 Aug 2019 09:47:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564739254; bh=mU/cphH8ryHrVmuO9omVALk2fgtD/LhRfsJrntv7E2o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H7bWKZQSoYm5DhGuNMQ4Sf8XnaDP1CLH5yQ015k/9ty2jJ/hDJ6pBy6bxYO+J1nSN juh/z4JbiWw1kEff315Al7QP21JAviz40YLe8MEXZ4/VaaHxEq9wf8Y4x6f6QxwXZ+ O5/6n4YQ32M7Xt/O/wKhrXD4cu0N6vA4DGafVOoM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nikolay Aleksandrov , "David S. Miller" Subject: [PATCH 4.9 150/223] net: bridge: stp: dont cache eth dest pointer before skb pull Date: Fri, 2 Aug 2019 11:36:15 +0200 Message-Id: <20190802092248.205636118@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 2446a68ae6a8cee6d480e2f5b52f5007c7c41312 ] Don't cache eth dest pointer before calling pskb_may_pull. Fixes: cf0f02d04a83 ("[BRIDGE]: use llc for receiving STP packets") Signed-off-by: Nikolay Aleksandrov Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/bridge/br_stp_bpdu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/net/bridge/br_stp_bpdu.c +++ b/net/bridge/br_stp_bpdu.c @@ -147,7 +147,6 @@ void br_send_tcn_bpdu(struct net_bridge_ void br_stp_rcv(const struct stp_proto *proto, struct sk_buff *skb, struct net_device *dev) { - const unsigned char *dest = eth_hdr(skb)->h_dest; struct net_bridge_port *p; struct net_bridge *br; const unsigned char *buf; @@ -176,7 +175,7 @@ void br_stp_rcv(const struct stp_proto * if (p->state == BR_STATE_DISABLED) goto out; - if (!ether_addr_equal(dest, br->group_addr)) + if (!ether_addr_equal(eth_hdr(skb)->h_dest, br->group_addr)) goto out; if (p->flags & BR_BPDU_GUARD) {