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 0F7072F8E95 for ; Sun, 10 May 2026 15:46:36 +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=1778427996; cv=none; b=pGG1j3ViDZZ09dT6BvvLR487xgZllxBoOBgSL1slafxJsdwOpzJFi+ekyNSOjKRpwbNtd4gDh+cgEn648IFtWOZ87GIx9ePwD/3QK+3pUS3yCiFLPCGdB1vHbzKn62o6SrFgc0PFP1gIo3+d1YKhT2l2zXosVGf0gesq85Yz0vc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778427996; c=relaxed/simple; bh=swPt37YwjxootFV7RajhsqjMUZsKFK8EzybxGX+DX2s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k3EUFN57fmik2Ae01ljgQIedrYr2yrbh+RMeLAJo3Q2QAPkNhyjaTvBDXVPwfA8ePOrKqtcQiPhns3Prmyvp9Q1XLcnMNPvNikDoG0raYl8F9zcDlVMf8D2tLzedk34E892yoAJUg1TTuK0aBQJscXUWc7Mx5hAO21nLGBV8urs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oS2hHUxR; 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="oS2hHUxR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C1AAC2BCB8; Sun, 10 May 2026 15:46:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778427995; bh=swPt37YwjxootFV7RajhsqjMUZsKFK8EzybxGX+DX2s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oS2hHUxRa0CsqEeiIfT+ai2J86uRyuGjz6+baDZfXQxByViNCRcfRBNiVDpyF2Pi3 kM4AE/Aejfj1l1+nHg4tdhvuqiKkZTRVqPdcZQfdyXb+itBTJSnfD00a8wJ28hV4PU A87gY2MI6XzTJIBaaZk61Q6DQmLcZUY8jeGBshxLGYWxhqNE/JmQAc1ZWUuuBEeFPl 2KnEAlUNAa3uc4TgXt5IdLyiFSLgk3Epaxy8oT6NvhT+c8enUNP247Eq5GxacPpkRm 3STiYPxwPv6eVloaRO0W9dxwrh4/rCh0P50r7YgpQjmQYPIONu1uAm/acGUZxfUImI x7ALZvi3XemLA== From: Sasha Levin To: stable@vger.kernel.org Cc: "Russell King (Oracle)" , Furong Xu <0x1207@gmail.com>, Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y 1/3] net: stmmac: avoid shadowing global buf_sz Date: Sun, 10 May 2026 11:46:30 -0400 Message-ID: <20260510154632.158995-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050451-contact-pledge-2d90@gregkh> References: <2026050451-contact-pledge-2d90@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 b199e47e55c1b..8b369c622b0ac 100644 --- 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 *priv, int limit, u32 queue) 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 @@ 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, false); -- 2.53.0