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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham 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 70124C4360F for ; Thu, 14 Feb 2019 10:31:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3FA5E2229F for ; Thu, 14 Feb 2019 10:31:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ikfid62P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392080AbfBNKbZ (ORCPT ); Thu, 14 Feb 2019 05:31:25 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:33158 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388383AbfBNKbZ (ORCPT ); Thu, 14 Feb 2019 05:31:25 -0500 Received: by mail-ed1-f67.google.com with SMTP id a2so4611436edi.0 for ; Thu, 14 Feb 2019 02:31:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v9QsZna27eDWGOLy8sic3GiDjChUbsWjkmaK4ytcUE4=; b=Ikfid62PUedINLmflALiQat037+vg/U6mh9CyrdCqUETUaBqK4RDsitcteODto6Ntz zBMcCC66RtHZ7FvKlheehQLJh1VE/dLQj+qzGDj3HB9Nisbk+2zqEXri5pnu7IvfLM0h nxrEK6jNV93vBB5Vsz0/6Ks/GalctYWL9cPO/RcrTJCNFSU4nyTvwyNal91ttWaL2FBe LM9j3khrsZr8fwIbYha8tHo2bRcpDfb8uPEIekqMVN9nKdUyn800TktPacFPJNHhud5r mVZgsuARAapAkCYOzuMXulqUiAW6tu3razdJAuYW8HVBH4eku4yG3AmzqZxvD9GcyTG1 NoPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v9QsZna27eDWGOLy8sic3GiDjChUbsWjkmaK4ytcUE4=; b=jC5mhOOpqZuThf4eFrGCeRlcijfTTHyL1G7h8z/eeKsW5LCYq7GPzFaumAm1v5dmv4 GF4oZneDYyRZvj1A8Dn17JpEZgiMrLKnoY+98h7b6hhFz5tzTjSHWTWrltkoygUkcd/Y aK5tjBmA7ff98myx5IV0tE7KeD1kovg81kfvXqH1fLNKam4PN2qZroNkoX+nL+uajY7t IHZzC5gacYbVSBaCrBrBz/ttwMIpXnCKU9zKUSzzxuouCUkwXik5NGKwy+EO9WrA7zLU saXc5Nty0DGJfb6vwRU++95UwI0WmvCIgxMYVH0Fo/RSaCpzx2U5aqL5Ta6jn5YVreQe /7XQ== X-Gm-Message-State: AHQUAuY1cmyd5gJcDFoXWrhoIoxksjWq5TeAMJdvh6q1kvbtJdCyX4hf vEhbEkjiaGn9iDlCEj7WCwxsKffjGFs= X-Google-Smtp-Source: AHgI3IYAFo4w88NkUWjS8Q795edDzHj3lINlvtu3/C7Qt2aYekgOyt6jMYKe4WUdaPJ9Jvo3aDqSRg== X-Received: by 2002:a50:cdd0:: with SMTP id h16mr2507666edj.151.1550140283409; Thu, 14 Feb 2019 02:31:23 -0800 (PST) Received: from jwang-pc.pb.local ([2001:1438:4010:254c:1e6f:65ff:fed4:d10]) by smtp.gmail.com with ESMTPSA id p30sm543052edd.85.2019.02.14.02.31.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 02:31:22 -0800 (PST) From: Jack Wang To: gregkh@linuxfoundation.org, stable@vger.kernel.org Cc: Daniel Axtens , "David S . Miller" , Jack Wang Subject: [stable-4.9 && 4.14 2/2] bnx2x: disable GSO where gso_size is too big for hardware Date: Thu, 14 Feb 2019 11:31:18 +0100 Message-Id: <20190214103118.4350-3-jinpuwang@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214103118.4350-1-jinpuwang@gmail.com> References: <20190214103118.4350-1-jinpuwang@gmail.com> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Daniel Axtens commit 8914a595110a6eca69a5e275b323f5d09e18f4f9 upstream If a bnx2x card is passed a GSO packet with a gso_size larger than ~9700 bytes, it will cause a firmware error that will bring the card down: bnx2x: [bnx2x_attn_int_deasserted3:4323(enP24p1s0f0)]MC assert! bnx2x: [bnx2x_mc_assert:720(enP24p1s0f0)]XSTORM_ASSERT_LIST_INDEX 0x2 bnx2x: [bnx2x_mc_assert:736(enP24p1s0f0)]XSTORM_ASSERT_INDEX 0x0 = 0x00000000 0x25e43e47 0x00463e01 0x00010052 bnx2x: [bnx2x_mc_assert:750(enP24p1s0f0)]Chip Revision: everest3, FW Version: 7_13_1 ... (dump of values continues) ... Detect when the mac length of a GSO packet is greater than the maximum packet size (9700 bytes) and disable GSO. Signed-off-by: Daniel Axtens Reviewed-by: Eric Dumazet Signed-off-by: David S. Miller [jwang: cherry pick for CVE-2018-1000026] Signed-off-by: Jack Wang --- .../net/ethernet/broadcom/bnx2x/bnx2x_main.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c index 022b06e770d1..41ac9a2bc153 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c @@ -12978,6 +12978,24 @@ static netdev_features_t bnx2x_features_check(struct sk_buff *skb, struct net_device *dev, netdev_features_t features) { + /* + * A skb with gso_size + header length > 9700 will cause a + * firmware panic. Drop GSO support. + * + * Eventually the upper layer should not pass these packets down. + * + * For speed, if the gso_size is <= 9000, assume there will + * not be 700 bytes of headers and pass it through. Only do a + * full (slow) validation if the gso_size is > 9000. + * + * (Due to the way SKB_BY_FRAGS works this will also do a full + * validation in that case.) + */ + if (unlikely(skb_is_gso(skb) && + (skb_shinfo(skb)->gso_size > 9000) && + !skb_gso_validate_mac_len(skb, 9700))) + features &= ~NETIF_F_GSO_MASK; + features = vlan_features_check(skb, features); return vxlan_features_check(skb, features); } -- 2.17.1