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 41AB91B424F; Sun, 7 Sep 2025 20:12:48 +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=1757275968; cv=none; b=Ij39qLUThX9Z+eu4IRYJB+5cHATdtSFKv+aK/+RflngcAJSyufC/wKzbVNJwBuFXaNIQcrpS4XjFKCVImWxOwN1VqgjXwIOufy3ssyQvUWUySLzSDyTVvfrIS7du9CK45jQwNv9EF0WEJAXOHBhto1FjlwDWUdtgO64iQyr0jN8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757275968; c=relaxed/simple; bh=7nO8MYcInSzxWDSVik7MAksElUQXcNA68IA4v7bOge0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n3W6hUKWUs1o01r5fNwbAiGVfr8iZhJIgwECe1nNqlzaXVkGNr28hjhE9YCHbeRqeQ1GjJVrkMDEt4j4KgPzaDoiIis6FdV6rLyDYx/ZAbLIZUmPi+G06k4wHH4z3VVjJ6+6sFg6DXAsG8avcT5cXFYALEb7ROEShU7Z2T7oZhg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PjYPlYzA; 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="PjYPlYzA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B761BC4CEF0; Sun, 7 Sep 2025 20:12:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1757275968; bh=7nO8MYcInSzxWDSVik7MAksElUQXcNA68IA4v7bOge0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PjYPlYzABtMhoBhKHDb4Oi5Qyecw6qCFz/E+wCrFIPmMhXpi9cuDx6Qdq0J5YxKmG +QPstmfa4joZvu29T85BbyTlSvaTLs8lj5WKzuS+rSNs7KOGyMzA6iWiC6exedVRgR DlgfD0ppUx3oyIE5pqfD1ABAiaWi33Bn7PPbBZdw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rosen Penev , Vadim Fedorenko , Simon Horman , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 21/64] net: thunder_bgx: decrement cleanup index before use Date: Sun, 7 Sep 2025 21:58:03 +0200 Message-ID: <20250907195603.977612891@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250907195603.394640159@linuxfoundation.org> References: <20250907195603.394640159@linuxfoundation.org> User-Agent: quilt/0.68 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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rosen Penev [ Upstream commit 9e3d71a92e561ccc77025689dab25d201fee7a3e ] All paths in probe that call goto defer do so before assigning phydev and thus it makes sense to cleanup the prior index. It also fixes a bug where index 0 does not get cleaned up. Fixes: b7d3e3d3d21a ("net: thunderx: Don't leak phy device references on -EPROBE_DEFER condition.") Signed-off-by: Rosen Penev Reviewed-by: Vadim Fedorenko Reviewed-by: Simon Horman Link: https://patch.msgid.link/20250901213314.48599-1-rosenp@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index d749431803e2e..460f8c0989947 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -1517,11 +1517,11 @@ static int bgx_init_of_phy(struct bgx *bgx) * for phy devices we may have already found. */ while (lmac) { + lmac--; if (bgx->lmac[lmac].phydev) { put_device(&bgx->lmac[lmac].phydev->mdio.dev); bgx->lmac[lmac].phydev = NULL; } - lmac--; } of_node_put(node); return -EPROBE_DEFER; -- 2.50.1