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 CBD2414BFA2; Sun, 7 Sep 2025 20:16:46 +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=1757276206; cv=none; b=JJmhj+/R1bI/v+wOYwTZ27+0NDAlsegIuCDHjhPvTbpACZKT5m47arskJwXnFMwntJnMN/TXBsB0jFqu4lbJJYCXIwBzaGyg3j2w35Bl3dja87HMN2Tt9N+CmwI80ObctXWaIKL+3u9PRtH6hkN3hropbD+yzJ/dkHIH2kj5oWQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757276206; c=relaxed/simple; bh=iCDmeULOKN+TlPV7mKg1M9qoJAR5Q6ATOMf5BqfAhBg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CR4/m28bET2f2e54iklgPJeMf1uJZEQ12IkwIgk2v9ibKsLqJCMm2dppmq/oqtM9ay2abYntOrnEhnzKf82baxU8kzCiAk48/+kjPmg8eQGS/y5Yx8oenUXdPHO1J2zhXGh8ssYSpUAXkv/2rdiyqJ/yROrpJQdHcqZ81Awzmbk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hWun+iuq; 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="hWun+iuq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0BB72C4CEF0; Sun, 7 Sep 2025 20:16:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1757276206; bh=iCDmeULOKN+TlPV7mKg1M9qoJAR5Q6ATOMf5BqfAhBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hWun+iuqn/+qGWnClzQ9d9x/M7FM69XtOs/wh6h9sa+4LZR/JGjapk1gi+iU0PSzn M3mGQNrNhThqgm+DA7mBLIlOMQGfQTE5xdMY62ecll/8OrK4Y6pczdhCFmk3QqXQrY m2++CigqNljMFSZdv3XxoZ22tN2v4p2lhdiEQ6b4= 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.1 031/104] net: thunder_bgx: decrement cleanup index before use Date: Sun, 7 Sep 2025 21:57:48 +0200 Message-ID: <20250907195608.508098900@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250907195607.664912704@linuxfoundation.org> References: <20250907195607.664912704@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.1-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 d054c519cd617..bb70afae10c4c 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -1518,11 +1518,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