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 2C3C719CD03 for ; Sun, 10 May 2026 14:22:49 +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=1778422970; cv=none; b=Q4n9ga2yItO9b1GHfxU7sJ4WuEVgzxYFTdSFDKl165BANJlKNuYnGrvhRJiPXyqIxswhhvJQpWTIpvrngWvTmdjkidKcPfPPIcmrPSaoscs4Vd8ZcGw0z0rcesyzrugL9UtLYghpLw/da8i0yf6dC4rwZOLc90x6kHrvKvvOasI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778422970; c=relaxed/simple; bh=SVmScnbSzMLHxVHpRRzEZAJkZHpxPrFxZ8AzlRy7krQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LpcoPE09pSTxcKbbAfpwG2J6s+aR06OLUH2p6LL7qFGpYBsh7+tjaPOGM/KA6Te9KO3jsxUh/8hy8K1XnfMF04GgWZrAAESCouy/i+LLSirecHXFb3nz5Kz6t2WE6I6f0W4ZqW8fiVuOTj3kgA6854zCPM0p+DYIkpJuH+1LJSY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=thmA1BCg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="thmA1BCg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3FFFEC2BCB8; Sun, 10 May 2026 14:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778422969; bh=SVmScnbSzMLHxVHpRRzEZAJkZHpxPrFxZ8AzlRy7krQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=thmA1BCgib02EDjKnC1o6vj6MxpwtYbUZFDLzUjH0QO3aTxGuHsdXK6LuHq/RnvkC uMhgPh/f4VthruVI5OwNPqcU/nWtNSKYwPF60Mnp0D1bvhFWyXB7vd/QBVBhHrSpB1 IJg7j+DgSazIZ0xmKvQ1TLBZWnyL7lS6VErW00so0jFJ00MHQgFDo4kn1YEuvGimlC abJwMYlD9GwMGlYKK5t3dqNq5vc6HgywY7aJ7xJZtULS7DfbMS2oqk3WpWqYci+8x/ 4gKnFNp/XbpiSeNqfvjbefZ78UdMw1hgG0S0OFbzmt5AWUSwgKYvPU5NnZIASeXomm JvVHoHa+YlD3Q== From: Sasha Levin To: stable@vger.kernel.org Cc: "Russell King (Oracle)" , Furong Xu <0x1207@gmail.com>, Jakub Kicinski , Sasha Levin Subject: [PATCH 6.12.y 1/3] net: stmmac: avoid shadowing global buf_sz Date: Sun, 10 May 2026 10:22:45 -0400 Message-ID: <20260510142247.4179438-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050448-gawk-hybrid-73b9@gregkh> References: <2026050448-gawk-hybrid-73b9@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index 5016b8c39b684..8d32d4fc67735 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5406,10 +5406,10 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) struct sk_buff *skb = NULL; struct stmmac_xdp_buff ctx; 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)) { @@ -5524,7 +5524,7 @@ static int stmmac_rx(struct stmmac_priv *priv, int limit, u32 queue) 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, true); -- 2.53.0