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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE900C636D7 for ; Tue, 21 Feb 2023 20:01:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=URxv/txKk7/Owjozh9cl7Z22mhH9g1OWBlcTCAG73Ck=; b=xQm0Y/A3KtVtpl L6pVDPYMb9pxNpZmyYcYQsG4gdNxCoJYzkliUt834ecmtiJzrTzf7TExzTvQRCSrctfM+vWvOPo6v KBozl+8Dxvs7Z962l+nHpiKrhvA8H5QqzzaGpGSXRPqv1xmmIkd273Gy1qSFOZX/Lcr/59+o8Kooc GhRqmTR+8SWJq2Qs8D0f0Oy1AA48YCnZOMP+J6lZcu8hfTlyZUrZGRyb3gdDpPoEcDIl+5vU358ci mVePirJj5hJHx8gN5umKI8mszWnsSrkq4alNudLsfdvDRQKf0wUEL9bV/Cu0FFpcURmpmOaFL3oCy YYjxcvcsFcKCSKvWLpfQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pUYoB-009cJX-0x; Tue, 21 Feb 2023 20:00:15 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pUYo6-009cGv-SC for linux-arm-kernel@lists.infradead.org; Tue, 21 Feb 2023 20:00:12 +0000 Received: from maxwell ([109.42.115.188]) by mrelayeu.kundenserver.de (mreue012 [213.165.67.97]) with ESMTPSA (Nemesis) id 1MqqLB-1oi0cp2xij-00mwY7; Tue, 21 Feb 2023 20:59:50 +0100 User-agent: mu4e 1.8.14; emacs 28.2 From: Jochen Henneberg To: Simon Horman ,Giuseppe Cavallaro ,Alexandre Torgue ,Jose Abreu ,"David S. Miller" ,Eric Dumazet ,Jakub Kicinski ,Paolo Abeni ,Maxime Coquelin ,Ong Boon Leong ,netdev@vger.kernel.org,linux-stm32@st-md-mailman.stormreply.com,linux-arm-kernel@lists.infradead.org,linux-kernel@vger.kernel.org Subject: [PATCH net V2] net: stmmac: Premature loop termination check was ignored Date: Tue, 21 Feb 2023 20:58:30 +0100 Message-ID: <87356y7pse.fsf@henneberg-systemdesign.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:PGSPSIWFzfFaZ6WQFk04hnkrL2Jr+FcXFWwVHu3dZurDPzXBb8W MEiFKk3Fs9MqaIpz2ZNHez+WdZY5pmgWk5dBjeMkgP1APdnpiwHk8vu3pC+p5hUaO/xoqoX SA8ectum9QkFYpa07y3YvQUwzhjX06GlmzexGgukvabZWturdbRfzvJT2mEbTJe3M33l6gN eR1jOIqJAugsKtJMeEKFg== UI-OutboundReport: notjunk:1;M01:P0:IvducrWJ2gA=;sj6aQA6LBDhuosVehFMn9CkCfV+ TuKyhZyizukGLSoLYW78SuZ7Cm18vUWvP7wvjDZoXOixSI76xnnFuuIPHm3m9XEIRu4Zi5EvQ /5bOP8ysHXZMYXoy3QKwtQzFqULJiUJerxe0p0XKTGjE69P0dsqPo96DXeLBFIzZDEVWeh9qx dbXEF/dlvnesjWyLOqJCQs/1U1kKenbLBtBzeUCNvJfqFtCdzTgDFzv6PTYibKM/v/F+ohnd+ TyCijV0pR03YHdgjaQw4F0c5wt3AiKw4OlW//uIaJTsBMSuTw1k4hFc2v2tE71xPfeTk4sOOy +Zeq/xbtebg06AMMn4pXrtIxjK2ZjMR+evjObP1kW1NZFXJmGcZJXxa2qwupXZdMPkonBO1iZ kZpYoahZsQ+Qe2wN5JF04cj6JMbP7yJ0j+ot4gxRGa+yZBPEfrW2gWN+aNJLUIHqe8n9YaopY P5DdjV21uq78Lq8RG19c4i6ujTYJlnWrMITxqBo6QFbUm7jIPnfug88C+N+BSOdvOeNyQAVv5 nicdGetivvcivvcF9K1ejXn3WSG+mycU6N1TKkPtUwZmHSr345UmQZqeUducRZk8SV96P6wty GlLY6K5wcPe8qdEVXospVWd5Hciw/2zfxdZ/06ktzPVZ/P1idiWjol7I6+Bu3/Zze//Roxig/ xoHo9OXzj7s+AmoqsbUbWngLK2ioOUVrgzXTdosIqg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230221_120011_219026_E45A1801 X-CRM114-Status: GOOD ( 11.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The premature loop termination check makes sense only in case of the jump to read_again where the count may have been updated. But read_again did not include the check. Fixes: bba2556efad6 (net: stmmac: Enable RX via AF_XDP zero-copy) Fixes: ec222003bd94 (net: stmmac: Prepare to add Split Header support) Signed-off-by: Jochen Henneberg --- V2: Added fixes tags for both commits that introduced the issues drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 1a5b8dab5e9b..de98c009866a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5031,10 +5031,10 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) len = 0; } +read_again: if (count >= limit) break; -read_again: buf1_len = 0; entry = next_entry; buf = &rx_q->buf_pool[entry]; @@ -5221,10 +5221,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) len = 0; } +read_again: if (count >= limit) break; -read_again: buf1_len = 0; buf2_len = 0; entry = next_entry; -- 2.39.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 CB185C64EC4 for ; Tue, 21 Feb 2023 20:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230031AbjBUUAZ (ORCPT ); Tue, 21 Feb 2023 15:00:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229997AbjBUUAX (ORCPT ); Tue, 21 Feb 2023 15:00:23 -0500 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11CB92914E; Tue, 21 Feb 2023 12:00:17 -0800 (PST) Received: from maxwell ([109.42.115.188]) by mrelayeu.kundenserver.de (mreue012 [213.165.67.97]) with ESMTPSA (Nemesis) id 1MqqLB-1oi0cp2xij-00mwY7; Tue, 21 Feb 2023 20:59:50 +0100 User-agent: mu4e 1.8.14; emacs 28.2 From: Jochen Henneberg To: Simon Horman , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Ong Boon Leong , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH net V2] net: stmmac: Premature loop termination check was ignored Date: Tue, 21 Feb 2023 20:58:30 +0100 Message-ID: <87356y7pse.fsf@henneberg-systemdesign.com> MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:PGSPSIWFzfFaZ6WQFk04hnkrL2Jr+FcXFWwVHu3dZurDPzXBb8W MEiFKk3Fs9MqaIpz2ZNHez+WdZY5pmgWk5dBjeMkgP1APdnpiwHk8vu3pC+p5hUaO/xoqoX SA8ectum9QkFYpa07y3YvQUwzhjX06GlmzexGgukvabZWturdbRfzvJT2mEbTJe3M33l6gN eR1jOIqJAugsKtJMeEKFg== UI-OutboundReport: notjunk:1;M01:P0:IvducrWJ2gA=;sj6aQA6LBDhuosVehFMn9CkCfV+ TuKyhZyizukGLSoLYW78SuZ7Cm18vUWvP7wvjDZoXOixSI76xnnFuuIPHm3m9XEIRu4Zi5EvQ /5bOP8ysHXZMYXoy3QKwtQzFqULJiUJerxe0p0XKTGjE69P0dsqPo96DXeLBFIzZDEVWeh9qx dbXEF/dlvnesjWyLOqJCQs/1U1kKenbLBtBzeUCNvJfqFtCdzTgDFzv6PTYibKM/v/F+ohnd+ TyCijV0pR03YHdgjaQw4F0c5wt3AiKw4OlW//uIaJTsBMSuTw1k4hFc2v2tE71xPfeTk4sOOy +Zeq/xbtebg06AMMn4pXrtIxjK2ZjMR+evjObP1kW1NZFXJmGcZJXxa2qwupXZdMPkonBO1iZ kZpYoahZsQ+Qe2wN5JF04cj6JMbP7yJ0j+ot4gxRGa+yZBPEfrW2gWN+aNJLUIHqe8n9YaopY P5DdjV21uq78Lq8RG19c4i6ujTYJlnWrMITxqBo6QFbUm7jIPnfug88C+N+BSOdvOeNyQAVv5 nicdGetivvcivvcF9K1ejXn3WSG+mycU6N1TKkPtUwZmHSr345UmQZqeUducRZk8SV96P6wty GlLY6K5wcPe8qdEVXospVWd5Hciw/2zfxdZ/06ktzPVZ/P1idiWjol7I6+Bu3/Zze//Roxig/ xoHo9OXzj7s+AmoqsbUbWngLK2ioOUVrgzXTdosIqg== Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The premature loop termination check makes sense only in case of the jump to read_again where the count may have been updated. But read_again did not include the check. Fixes: bba2556efad6 (net: stmmac: Enable RX via AF_XDP zero-copy) Fixes: ec222003bd94 (net: stmmac: Prepare to add Split Header support) Signed-off-by: Jochen Henneberg --- V2: Added fixes tags for both commits that introduced the issues drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 1a5b8dab5e9b..de98c009866a 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5031,10 +5031,10 @@ static int stmmac_rx_zc(struct stmmac_priv *priv, int limit, u32 queue) len = 0; } +read_again: if (count >= limit) break; -read_again: buf1_len = 0; entry = next_entry; buf = &rx_q->buf_pool[entry]; @@ -5221,10 +5221,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) len = 0; } +read_again: if (count >= limit) break; -read_again: buf1_len = 0; buf2_len = 0; entry = next_entry; -- 2.39.2