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 1CBECC64EC4 for ; Wed, 22 Feb 2023 07:41:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231222AbjBVHlK (ORCPT ); Wed, 22 Feb 2023 02:41:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229739AbjBVHlI (ORCPT ); Wed, 22 Feb 2023 02:41:08 -0500 Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.126.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 58E2E34C02; Tue, 21 Feb 2023 23:41:03 -0800 (PST) Received: from maxwell ([109.42.114.8]) by mrelayeu.kundenserver.de (mreue010 [213.165.67.97]) with ESMTPSA (Nemesis) id 1MjSLi-1opOMz0UoM-00kvyc; Wed, 22 Feb 2023 08:40:35 +0100 User-agent: mu4e 1.8.14; emacs 28.2 From: Jochen Henneberg To: 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 V3] net: stmmac: Premature loop termination check was ignored Date: Wed, 22 Feb 2023 08:38:28 +0100 Message-ID: <87y1oq5es0.fsf@henneberg-systemdesign.com> MIME-Version: 1.0 Content-Type: text/plain X-Provags-ID: V03:K1:kw0roPPoAZa1x6voWlAWTXw1lMGoFSGMoAVQEeIS5XD1h36ORDw YNIxBFWdNbXwS345whm6mIykdDyZ4BgNJWckdG6SgACNXtJA0tnAk5gVZHTkUp9wLIl5k95 Jg/Wsvk/DTkohSIIRSwZX8fWyjC46p9pE2nUmP2jeIIA5IC8XZOdVzf/r+quqBeWmniPanD 6wKJrVeIVdI7V66fSp9lw== UI-OutboundReport: notjunk:1;M01:P0:N7tPwk2Ow1g=;Gptd/97H+m36saouYGmfHZCqJuv XGYg59NycFPtpj+eh+W89J36G3+N4RKKFNWSh/T4foAZWajFDbJyMwdAWBvrxv4Ucgx7NHqMX vYyN6nsfIqD4EztJKr/ejo1VysFDHDkPwFCldDJuiOucIb9YH0Do1zAGETtOqY6ddibXA9lc5 B3FZTP0mt6+A+64vb8hGm8svz/McRH+9Z7ph6z3j5yo3tNj9LTV/Ysc2sYXGDXekgwsAEmJcF pJNT5oE37chG+md0Xe9FmcIuWh5CSZp4zZlNjiYjs1WDKET6PlJDoaSajeNZ4Pq9bF5UG3NwB bKAthIZs6elOa7mqr0TguPAs1wnML7x3qqF6cGFuVY2nYiqYk9L3ohkRYvQOARoxu21Y3+UO+ eVXdnvpkE9YAe3JQkRYg8j67F3M8dDefPvW/Au0hedecjtRp/9vy1nyBgrLvvSVDY1qb0IcPC 2CIFl/z1RE5Z+aGBS1BbY+HZ0jLvk/Bt8BSvJx8mElJ/YkDU3gTUEMHiYUu9brPQ+1cEQqhQb fvTTg9pIfYjenoClvBjxQ9LAsyHrBmGb1EydHuPwhtNxVrUegKSy+2PEPGi01elyybjYfNYcv 6Iezssx9R31E0Ii4g4n62zIWlBjbXFZvG+0l3z8tAsaoVwhpACei/2xXXxKIG1vhUhLJtGLb7 CFEIdtWwhmAZgAi5tgD16/ZaQfRelhAe8YrhZNI7Lg== 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 V3: Fixed fixes tag format 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