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 C8C89C7EE23 for ; Sun, 26 Feb 2023 15:15:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231825AbjBZPPd (ORCPT ); Sun, 26 Feb 2023 10:15:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41160 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232137AbjBZPOz (ORCPT ); Sun, 26 Feb 2023 10:14:55 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5712211E8; Sun, 26 Feb 2023 07:05:33 -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 dfw.source.kernel.org (Postfix) with ESMTPS id C6E0E60C56; Sun, 26 Feb 2023 14:53:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45629C4339E; Sun, 26 Feb 2023 14:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677423198; bh=w0jT552YvAWF7UhHjSZqkYejdE0wfz0l6a+XUcBY6Ew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PPOhByYhAYEXsI/ABlFX4mkqJHWvQZF/LkSiEbxxFEKYV56n0whlrxr4GxCwiYY7E utpanHuPEXcNPxUUvUB3G3fRCxFSByGfYiw0EBf3nys+29OpGl2Umfxo8VO6dNm8GK a9Cq4WuaftANoYFf9eKl1dIaa00ZqaU9aITugoxhOFpIzZ+wecGqyaMbf1T0O4LHB4 yL7aFZb+kiCIKjF5W6s4ZZ5RD7XkXfPn9Kz01ifEcKnz/Pohj7PyzzAM5sOvivlVkM +2priwWQQ/ytAEMbV2cDD+Gl57BaKxzWlkdp3I6Nm+aO+BBKHrrCYJIP1g856eVs0T qn+CXkxbbJxrw== 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 4.14 09/11] net: bcmgenet: Add a check for oversized packets Date: Sun, 26 Feb 2023 09:52:51 -0500 Message-Id: <20230226145255.829660-9-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226145255.829660-1-sashal@kernel.org> References: <20230226145255.829660-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: linux-kernel@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 9bb398d058379..e5e52c0c39a55 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1799,6 +1799,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