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 50CC5C7EE2F for ; Sun, 26 Feb 2023 14:50:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229908AbjBZOuD (ORCPT ); Sun, 26 Feb 2023 09:50:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229909AbjBZOtS (ORCPT ); Sun, 26 Feb 2023 09:49:18 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9960D9EED; Sun, 26 Feb 2023 06:48:01 -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 1A7CCB80BD9; Sun, 26 Feb 2023 14:47:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6F33C4339B; Sun, 26 Feb 2023 14:47:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677422869; bh=ExSzCyn+7zTaILpbKKw3qTjrXLCqtmJLH7HBes0BLxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lHHZYo1f1sQx/gkBZLIpa3JRjXZRe6u/88oiDuqgyo1RUrHeIZSRrGfZvs7FHQOjD POnZF5r8Shj8OB71P23NXauDPGoL/1b0X/nRkixMqHXG+I9MbaWREBQGJmr3viDgzq O7QSCD/s8/nIpygdIsLX4QnwCb0ry2Hd7ExFYsef/8VD+8x7/3M35V/luE6zlyj3S/ UtbVWqkOeUvVTjTsZuCIBATft8yMy7SIJkrYbJnf2qv7AR+XOTZtwFmeJV5vVXs5tq l8zcEwrGrrNGT+KuXMSkz12KrPZeBqMOPruhjv/cnhM5DbC5oYo1bYl2fEGfKaHH9D 1vYAxPT4fXY6w== 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.1 25/49] net: bcmgenet: Add a check for oversized packets Date: Sun, 26 Feb 2023 09:46:25 -0500 Message-Id: <20230226144650.826470-25-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230226144650.826470-1-sashal@kernel.org> References: <20230226144650.826470-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 25c4506069856..f679ed54b3ef2 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -2311,6 +2311,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