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 2E0A7C7EE33 for ; Sun, 26 Feb 2023 14:48:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229989AbjBZOsO (ORCPT ); Sun, 26 Feb 2023 09:48:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229852AbjBZOsA (ORCPT ); Sun, 26 Feb 2023 09:48:00 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7464413504; Sun, 26 Feb 2023 06:47:15 -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 sin.source.kernel.org (Postfix) with ESMTPS id 5051DCE0E7A; Sun, 26 Feb 2023 14:45:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C51B8C433A1; Sun, 26 Feb 2023 14:45:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677422753; bh=c+0Agwj8jgxbqif7bpPJnIHw6jqU+UzFDcsDne8RFOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D4K3wdzpZysOJQ3Sd82t0a4+hkPOqgdzoIMWq528S7rMZqiFMymtoV5QaRPZte+IP gmNfNZAovqohxzm2QJBpSWP1ejGYrMECoCWa3vq+K94itPT4JFoElooyBxz1Mcw2ld OguWTqvBolBKx1bJOK9LSyVPNcUV7vWb/ExQiiWzTsGNNSrIwTMFVnukW0xojdJxJr 4N3Y5PAZRrb2pvx2HaKM6u18TzkyydTR+BSVfH1rFAwhs1TbgcDfzOt9wsj647v8Ys lmrr018WHJyzUzbvW0Y3Ogi+39ftjKoAccTohs5H7W2dlhAlEZz82FRylCnqCV1BFE 2uEScS243uNMw== 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 6.2 27/53] net: bcmgenet: Add a check for oversized packets Date: Sun, 26 Feb 2023 09:44:19 -0500 Message-Id: <20230226144446.824580-27-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226144446.824580-1-sashal@kernel.org> References: <20230226144446.824580-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 21973046b12b4..d937daa8ee883 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2316,6 +2316,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