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 390B0494A0E; Fri, 15 May 2026 16:14:10 +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=1778861650; cv=none; b=McGyy3MxclPkia+tTeB157/FGxSu/vXBhNxnTHuhAFNcKHYtAeAcfXcOKnVLZGg2+HCQsvvVgFa+xU87nzxoUcOIAcBo5qWhqaovc1BuJRjPPwbiG9P8Bg2C5vyOONcjCzaceaOcy8iiMKPt4x9GaDL/iSmvdG4ZypRRhlPTqQ8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778861650; c=relaxed/simple; bh=B7G0vOi4bQoBfo6ez7hT1sVe3p3Ef51L95HJApK2OW0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hn0Y6tCDro9XPVNFgQwLX60K+CwogT+j87vukY0Jhj1HP1lyTFVGTxY/buZ7cxt2WzcuRP36BBX5W7rEp/3IjwqrMpOzwRd71zUAXsvBbaTRfHnN5LQIMvrmPNVD4ejA4UiBpyKKK3li0pEVgV97FNyFio8ELMTGgHt8PT8Y1ag= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=TDagb5YZ; 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="TDagb5YZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE503C2BCB0; Fri, 15 May 2026 16:14:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778861650; bh=B7G0vOi4bQoBfo6ez7hT1sVe3p3Ef51L95HJApK2OW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TDagb5YZ6ei7FqV7uK8RnggqdX3QSzxrG9v714gxXGOzTY1r0TMliBKCs7Bmv3eDP vEOqbwW0lnikhGsiFaFMyiCepTvUtY3iJMNcMFrL/FR0qeUD2M5CVgZHa9KvJoGTaU X+V3kcPPT3Zxnb0/TOpIy8msHrYgljR43mF403F4= 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.6 409/474] net: stmmac: avoid shadowing global buf_sz Date: Fri, 15 May 2026 17:48:38 +0200 Message-ID: <20260515154723.902983506@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260515154715.053014143@linuxfoundation.org> References: <20260515154715.053014143@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.6-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 @@ -5279,10 +5279,10 @@ static int stmmac_rx(struct stmmac_priv 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 @@ 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, true);