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 C49E7345757 for ; Sun, 10 May 2026 15:10:21 +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=1778425821; cv=none; b=mf98OMuvTVXd5a3/tzuPmOcJ7VUYmx5HJYGkE+clTxWm1D6k/+CyMxk2kd2BHw3dNw3fDioipom2muBP4TcxV8mI2sEoFIlvYUYtlDV8IUS0wB2XQGHi9BuMrr9nidwSTee6QKauLEXkkRVFBMpaS8lJSg6hIYbEqStV0dLs3tQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778425821; c=relaxed/simple; bh=1JUm4d8rZIz8v6fBnkDKK/FrEacBpngOie52hJMpo4E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CaAt/kC/bpEXcOyFaf1Zu5DxENHdiqIx5cca03b/KefKJGVOOsNW8HU0h1IA+K7aTpqaJ7Bk1afltQBj8TuoNVl+eJL0C+iZeOeiz+wkUFENtDfgB78XvHAj0bjfNm5U8Rcsmj7+L1FSCdcCAlSSmlJcROJZ4DFaEdhULRmLa3I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=P9/OK+xM; 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="P9/OK+xM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E301CC2BCB8; Sun, 10 May 2026 15:10:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778425821; bh=1JUm4d8rZIz8v6fBnkDKK/FrEacBpngOie52hJMpo4E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P9/OK+xM36Tfw5A8bSX5ptLCuVrgyZz6BEqLzd8YuUFG+2RSMd36Safygq51k4hEY mSKJ1gB4F0hwhshe9CGzh87OY7xog9HVStfjz0iNzuQYVktRP91Qs5lz2eSS/tyAk9 Tqx+3zUwnPlVdlske5RRFw3jdlStvEDWygldKVbO7X18pSvfQW7mdqg8zvlIYurw56 hTCCmicVCAU9QBCmX1V6W3T7lLV5QAJhj2tVp09UtheK9OW+yRNHUuGSrBUBwqpq75 Z+iMtd84EkvJThf9FETUF3nz2wjE2oRExM4ezaOrUz02oLChnEedyqq1Rki825Jes5 0v+oh03xFoMpw== From: Sasha Levin To: stable@vger.kernel.org Cc: "Russell King (Oracle)" , Furong Xu <0x1207@gmail.com>, Jakub Kicinski , Sasha Levin Subject: [PATCH 6.6.y 1/3] net: stmmac: avoid shadowing global buf_sz Date: Sun, 10 May 2026 11:10:17 -0400 Message-ID: <20260510151019.38468-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050449-dish-arming-999b@gregkh> References: <2026050449-dish-arming-999b@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 4c672e1db52e1..becedbbb2a740 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c @@ -5279,10 +5279,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)) { @@ -5397,7 +5397,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