From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 4ADFD4418E3; Tue, 16 Jun 2026 17:50:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781632220; cv=none; b=MPKn3m3YohWyX9qVFa2STepOOuyNpvhBSTbxFKl5OT5RakOSdbkckqqXQ2KNM7mvBgEVLzORs0BKkm+4rUNe3tBASSsXa1RQUfr9fKV5BU3JuVJGZfgIqWO9bb1BUtD85pWKI5U5VlAn6nGZO0MVgUd9HSg3DVwPwQK1YKcGQv8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781632220; c=relaxed/simple; bh=4DraywOt/w1K7FNVm+oiRbqG/+KFADHJAhxS2lOVklY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sxsAHtCo8sq3gdUkGUpFDSuQvAxqk626+jafvt5Mq5vidMNWPCl49KYWPrKw3e/0GjQP7BDgKWTMujW8bx0cRs0ZBrU/6mThCmkR8QiIAu6d7cF6TBiYzoIbCYvs5f01jqdVQqCkMxtZF6w71RTB9d3H9V+LUtgjszEOPUmRrOQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p8Sl9SVB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="p8Sl9SVB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4DE831F000E9; Tue, 16 Jun 2026 17:50:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781632219; bh=jPKazmj04ao8fPW4dfxXMM0/LrkJ7fpiVyQk02fZ/VE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=p8Sl9SVBfvsqqE3LjUVXGE+7xZExWStfdyNFzmuXCPIh3harBmeRVUdPVYZ185LpK MNYPS6ec58iXpGvd6FQCchsJMTLTqSDsNhMif51OG6e1+sAS4EFKA6FsuV1zjmPLoj DvruLFtyBdmIgs4d4slNWkVA3i0t88YY8z2naiKU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Russell King (Oracle)" , Furong Xu <0x1207@gmail.com>, Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 368/522] net: stmmac: avoid shadowing global buf_sz Date: Tue, 16 Jun 2026 20:28:35 +0530 Message-ID: <20260616145142.994967359@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: "Russell King (Oracle)" [ Upstream commit 876cfb20e8892143c0c967b3657074f9131f9b5f ] stmmac_rx() declares a local variable named "buf_sz" but there is also a global variable for a module parameter which is called the same. To avoid confusion, rename the local variable. Signed-off-by: Russell King (Oracle) Reviewed-by: Furong Xu <0x1207@gmail.com> Link: https://patch.msgid.link/E1tpswi-005U6C-Py@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski Stable-dep-of: 0bb05e6adfa9 ("net: stmmac: Prevent NULL deref when RX memory exhausted") Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5235,10 +5235,10 @@ static int stmmac_rx(struct stmmac_priv struct stmmac_xdp_buff ctx; unsigned long flags; int xdp_status = 0; - int buf_sz; + int bufsz; dma_dir = page_pool_get_dma_dir(rx_q->page_pool); - buf_sz = DIV_ROUND_UP(priv->dma_conf.dma_buf_sz, PAGE_SIZE) * PAGE_SIZE; + bufsz = DIV_ROUND_UP(priv->dma_conf.dma_buf_sz, PAGE_SIZE) * PAGE_SIZE; limit = min(priv->dma_conf.dma_rx_size - 1, (unsigned int)limit); if (netif_msg_rx_status(priv)) { @@ -5353,7 +5353,7 @@ read_again: dma_sync_single_for_cpu(priv->device, buf->addr, buf1_len, dma_dir); - xdp_init_buff(&ctx.xdp, buf_sz, &rx_q->xdp_rxq); + xdp_init_buff(&ctx.xdp, bufsz, &rx_q->xdp_rxq); xdp_prepare_buff(&ctx.xdp, page_address(buf->page), buf->page_offset, buf1_len, false);