Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp579959img; Fri, 22 Mar 2019 04:27:56 -0700 (PDT) X-Google-Smtp-Source: APXvYqzjEb/klglmKeiEXhvhgjMwhWeDdTtE2onJUfP8l74Fz365/nbDPYB5TsqrLhnIww/59lU/ X-Received: by 2002:a17:902:784d:: with SMTP id e13mr9149939pln.152.1553254076823; Fri, 22 Mar 2019 04:27:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553254076; cv=none; d=google.com; s=arc-20160816; b=uSJ1hytln8OvpQIXhxMEyyYDLGUYutHWrFqlxL7N4RmkIhPsljASolpTMy8q89anzj aQdW45c/jB51d7oFmmHOVc24euabm59aAPh3/+1y8Xf7lqJEYs49DhfO5OgfRl382EVT byKp+5aib3F1cmvQQKlCIEWxpPV7gzaR/BlupPY5NFPXy55zhbqF7F4hICHEndQZiCbW 9MA01tiE51/HRPcypvMAOME9aGiJb2AcTdjXablhlQ58ZBCOXq6YiF2ZdzVJWUwrvp0X puvbnBpg8Pi+jgRZP/FKEX0vrwEkBvexP+QGvw4ZnyPHVaD7SMqJfT502VgeSH0Tih+f XFAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=n0GUlZOXCdd6QiYPbeVqbG1xpBlQaRGZ5428aSDke0I=; b=v4ZH/PKEmOYmPZnIDO3I25Lj+qB8KGaGOE1driGGKVPhrL0MRZdOVXwSMLMByvDhRX SuKwR1SUr8FZAVrvzaf3SIVoykYkYLp9bl8uvQyK5jQ6/rLH48LitFjh2VOY902N54rF 7evaDdOkfyi0ImCq4FEs9Xiav7xmFokMC5B3AM7qPlOoZfcft9PUEkADwrBwDcNICDWP CT4NZdcBovSQgzC5RXgJ8nTayLcddJA3Vz4Jz4ymNx5C01NE5Uq7+fivw8gmXDzbt95y /yYe+FDR/Wlc2nWhmN4fYWfvE4jSa0AY+XTSao2rt2iP/ZHb51N4kw0BgxUB7HP6ReCV syqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=guwVwIT3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f40si7238808plb.339.2019.03.22.04.27.41; Fri, 22 Mar 2019 04:27:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=guwVwIT3; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728802AbfCVLY7 (ORCPT + 99 others); Fri, 22 Mar 2019 07:24:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:52076 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728808AbfCVLYz (ORCPT ); Fri, 22 Mar 2019 07:24:55 -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 575D320657; Fri, 22 Mar 2019 11:24:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253894; bh=uyhIJt0csu2C5N7IsCJG/YpBxJmiMT1F2LhjSFjQn54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=guwVwIT3KKAkwAvYCU1/BGj1piNxlWaQAQ4buIBjR1oGic8PobSvz/AM0m48S8Q1i 2hLb1kpMWMseWJ/9Uwgn3a6+vm6i0LFgetPFevJaSkYNyv5u/cfIquCM9w1yu+VaHw IcYwLSMHnBRB50hL/Y7z98MFm1MA5zCW+ZTFb5WQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Florian Fainelli , "David S. Miller" , Sasha Levin Subject: [PATCH 3.18 104/134] net: systemport: Fix reception of BPDUs Date: Fri, 22 Mar 2019 12:15:17 +0100 Message-Id: <20190322111217.747869953@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit a40061ea2e39494104602b3048751341bda374a1 ] SYSTEMPORT has its RXCHK parser block that attempts to validate the packet structures, unfortunately setting the L2 header check bit will cause Bridge PDUs (BPDUs) to be incorrectly rejected because they look like LLC/SNAP packets with a non-IPv4 or non-IPv6 Ethernet Type. Fixes: 4e8aedfe78c7 ("net: systemport: Turn on offloads by default") Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bcmsysport.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bcmsysport.c b/drivers/net/ethernet/broadcom/bcmsysport.c index dbe35e9277c3..c81e0139fe74 100644 --- a/drivers/net/ethernet/broadcom/bcmsysport.c +++ b/drivers/net/ethernet/broadcom/bcmsysport.c @@ -126,6 +126,10 @@ static int bcm_sysport_set_rx_csum(struct net_device *dev, priv->rx_chk_en = !!(wanted & NETIF_F_RXCSUM); reg = rxchk_readl(priv, RXCHK_CONTROL); + /* Clear L2 header checks, which would prevent BPDUs + * from being received. + */ + reg &= ~RXCHK_L2_HDR_DIS; if (priv->rx_chk_en) reg |= RXCHK_EN; else -- 2.19.1