From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BD4C387B05; Tue, 16 Dec 2025 12:31:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765888282; cv=none; b=JrntTevPRNwFodwm82BGfjnyNwfKZs3XoNIlIail+SohhFArY0096cTjsr8LfSzVvHa6dzAmdKrMSIBb2u//cuEXm2QTUHlvbz6Pl/SPuEH55zktePYw7clqyTU6vxxTEc0dV05FlUuSrQ9N32o+oPer3vPkOv8kCHpl9jWEUJA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765888282; c=relaxed/simple; bh=TxJybrQzE+w+M9nvuC4tG5Zb52SOTVjvZ+3VZGJ81TQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hu9Lk93qiLQ29YE/H9oivgZED1Fh3o1dSQfSlRvbVpFonPVJL8bKxVAB+w1mxmFpE9RYCygsSyjn6NA5iHI6BXYHuL91wUTWYn9Zk5bBVAF3ypJ9DzVx4RxP2Trqgl2Sg8plEZTJfhC+AkrIRlLY90tyfoJ1TImHHwfVlOoaZjY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p2Q9YiIw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="p2Q9YiIw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C86B4C4CEF1; Tue, 16 Dec 2025 12:31:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1765888282; bh=TxJybrQzE+w+M9nvuC4tG5Zb52SOTVjvZ+3VZGJ81TQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p2Q9YiIwtaBrFer/g1iurM9iCsK4QJmMDdnt6D0tbYIxebgqR/EuvWGdb41e5XwyS 5O7mLQ2L2JQy1qbOBY3c10SXbz9f00rxuxvNNr1KquHsrTtdyh4kpQ6gJKc/EWF3Gn R5t0cBW0qptR2qMgDf3sOexy6RGxSRZwyIKmShnA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alexey Kodanev , "Russell King (Oracle)" , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 486/614] net: stmmac: fix rx limit check in stmmac_rx_zc() Date: Tue, 16 Dec 2025 12:14:13 +0100 Message-ID: <20251216111418.979678248@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251216111401.280873349@linuxfoundation.org> References: <20251216111401.280873349@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexey Kodanev [ Upstream commit 8048168df56e225c94e50b04cb7b0514135d7a1c ] The extra "count >= limit" check in stmmac_rx_zc() is redundant and has no effect because the value of "count" doesn't change after the while condition at this point. However, it can change after "read_again:" label: while (count < limit) { ... if (count >= limit) break; read_again: ... /* XSK pool expects RX frame 1:1 mapped to XSK buffer */ if (likely(status & rx_not_ls)) { xsk_buff_free(buf->xdp); buf->xdp = NULL; dirty++; count++; goto read_again; } ... This patch addresses the same issue previously resolved in stmmac_rx() by commit fa02de9e7588 ("net: stmmac: fix rx budget limit check"). The fix is the same: move the check after the label to ensure that it bounds the goto loop. Fixes: bba2556efad6 ("net: stmmac: Enable RX via AF_XDP zero-copy") Signed-off-by: Alexey Kodanev Reviewed-by: Russell King (Oracle) Link: https://patch.msgid.link/20251126104327.175590-1-aleksei.kodanev@bell-sw.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 7b90ecd3a55e6..86e912471dead 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5258,10 +5258,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]; -- 2.51.0