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 2F1521F63CD; Sun, 7 Sep 2025 20:40:59 +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=1757277659; cv=none; b=PQIuxIM1fqoCg9AU+UACvJEUN90epXD6zS2K4HcTc8Pjq1ZGoiAkpIAehTqMbFKEG/Tl3wI+THoASF/pxoCJtVOMMLZL7nLUZra1lkTgEjYpl7zCPAaA6S+J3k4402tOLnyx4Frqk4ThJQZgG4T+BeUsy6nPQiPpHo0tJgmu7AQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757277659; c=relaxed/simple; bh=S3wzFH3UWqf9DZ7s6hKd29CIlMgRVZFTv33WL/1alh8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gf9q8/DpMSaZtX4GVRorbVWm77eYf/0pEYvpk0K4Okzrz/OUXRG9ptxzExPmi9zd015oCnXaMGqWZ/1MlNmB7LDukRAa6CK3GAFONZBatplvjhbodcBA4+WstZN9Wpf171PeeVBn4AvUqhMyVgUOmyxtRud8mhUjGSLoRf4TDkI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=q8mJI7gN; 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="q8mJI7gN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6499C4CEF0; Sun, 7 Sep 2025 20:40:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1757277659; bh=S3wzFH3UWqf9DZ7s6hKd29CIlMgRVZFTv33WL/1alh8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q8mJI7gN3uj11NqL0s7gB84B5gtj+dq/pH835WWoPyovNl4/ot6ATG3D5MxLG/5gl OArGtTPrHS9Kfu8TvVdZLyHx48/wbZTk7pR7lw1LkgqBi4/HhtvigKHKOAbcc53ymU I9JHG6PVY58srOsoVdVJuJaBbRMEVcus+CU4UrTU= 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 6.16 084/183] net: thunder_bgx: decrement cleanup index before use Date: Sun, 7 Sep 2025 21:58:31 +0200 Message-ID: <20250907195617.789824346@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250907195615.802693401@linuxfoundation.org> References: <20250907195615.802693401@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 6.16-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 0f913db4814ea..9efb60842ad1f 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -1519,11 +1519,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