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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9C6AC64ED6 for ; Sun, 26 Feb 2023 14:57:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231162AbjBZO46 (ORCPT ); Sun, 26 Feb 2023 09:56:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231510AbjBZOzl (ORCPT ); Sun, 26 Feb 2023 09:55:41 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 001CD1C309; Sun, 26 Feb 2023 06:51:34 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 64B53B80BAB; Sun, 26 Feb 2023 14:51:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1ADB0C4339E; Sun, 26 Feb 2023 14:50:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677423059; bh=sm2Rsig9PMFfrBwVkcXC8jvrayY+sfWPSnfHW/G6DXI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n3nyhFiwYre0D4/12cN0Jn51K53vIVscldLGCgJff4XTO9os2s8Kv7+vPt1bd8hpx o+zYpLq6lEuL1W1QIWsdnfGbpQyuRv3fJ4XvmmSOxXv0szRArPxkzXze0imOWdhIwj Sk7qf6MdXe/Gzz41kkTMkumCppG7VIWFlX5GYTLQKRsyztQO4XR7Xx0RCuLMb/8lne kb5Z8MvNwt4OhOX1pFRGT8+w8SWr9FIk2v78tjcgeM+88GrgPS1XDXjoDoKB/ztMmT PsxwCc6Jnk5tPq7jTIzUVv0nMfXQPD0awAJ04ZlhA49LvYfZ6jr6UK4n/yPnNXFA64 4d6IV2g2gSzlA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Florian Fainelli , "David S . Miller" , Sasha Levin , opendmb@gmail.com, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 18/27] net: bcmgenet: Add a check for oversized packets Date: Sun, 26 Feb 2023 09:50:05 -0500 Message-Id: <20230226145014.828855-18-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226145014.828855-1-sashal@kernel.org> References: <20230226145014.828855-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Florian Fainelli [ Upstream commit 5c0862c2c962052ed5055220a00ac1cefb92fbcd ] Occasionnaly we may get oversized packets from the hardware which exceed the nomimal 2KiB buffer size we allocate SKBs with. Add an early check which drops the packet to avoid invoking skb_over_panic() and move on to processing the next packet. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/genet/bcmgenet.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index e0a6a2e62d23b..7667cbb5adfd6 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2263,6 +2263,14 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring, __func__, p_index, ring->c_index, ring->read_ptr, dma_length_status); + if (unlikely(len > RX_BUF_LENGTH)) { + netif_err(priv, rx_status, dev, "oversized packet\n"); + dev->stats.rx_length_errors++; + dev->stats.rx_errors++; + dev_kfree_skb_any(skb); + goto next; + } + if (unlikely(!(dma_flag & DMA_EOP) || !(dma_flag & DMA_SOP))) { netif_err(priv, rx_status, dev, "dropping fragmented packet!\n"); -- 2.39.0