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 59D23328261; Wed, 3 Dec 2025 16:10:15 +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=1764778215; cv=none; b=LOG5d3NEU1wrKu8EkRgjf72HA7/y60k0smL3cDHA8hBnLDvYWjnADxXYEA0HredoXyQNXPQmtjSbl/08GAEbNnvmOs2cMEANP2zCnF2D/O0MBbzHU6OcicRZlyzSX6Ee/7kUMDWr+cB+dK/5/deiskMOd3xRDbUv+11cz2a+4AE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778215; c=relaxed/simple; bh=8QQhHodFLorJ2JMneKv17m83iLvC9zieJ2qnO0azIyU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HndlYw9HEUweUMNYcPMbSk6agNOtYLRXseSFYWdpLay8Bp+J++I/88izvvgdGdn8v7jFyGK1kUrrMFqIodYH+RtP9h1ZRg3EBen8AONdT/D3zw2zB90hbUucZiiHRRFxWuwQvq7DTQ5iVePF9NkDWREd05vQ/ykqydwu1jzJgu4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=t7n07kUs; 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="t7n07kUs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7A46C4CEF5; Wed, 3 Dec 2025 16:10:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764778215; bh=8QQhHodFLorJ2JMneKv17m83iLvC9zieJ2qnO0azIyU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t7n07kUs0HCcZr7Tp9STVeZSxT3OMTWqWzhyjkrmiepdDtxqitypeDl7/c4jTWJpG eFhcSgb8AyDnmC+23qd198vWfvQZWRhZYWA42Q5B2i3DYoRYbwC+KUVbdw+J9hn3y4 2uSiPUXVD2zVsXSsh8wl8zEndkmub3wwNRsYzagQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Buday Csaba , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.15 245/392] net: mdio: fix resource leak in mdiobus_register_device() Date: Wed, 3 Dec 2025 16:26:35 +0100 Message-ID: <20251203152423.188758812@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152414.082328008@linuxfoundation.org> References: <20251203152414.082328008@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Buday Csaba [ Upstream commit e6ca8f533ed41129fcf052297718f417f021cc7d ] Fix a possible leak in mdiobus_register_device() when both a reset-gpio and a reset-controller are present. Clean up the already claimed reset-gpio, when the registration of the reset-controller fails, so when an error code is returned, the device retains its state before the registration attempt. Link: https://lore.kernel.org/all/20251106144603.39053c81@kernel.org/ Fixes: 71dd6c0dff51 ("net: phy: add support for reset-controller") Signed-off-by: Buday Csaba Link: https://patch.msgid.link/4b419377f8dd7d2f63f919d0f74a336c734f8fff.1762584481.git.buday.csaba@prolan.hu Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/phy/mdio_bus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index 95536c5e541da..a8a4cd68f6886 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -80,8 +80,11 @@ int mdiobus_register_device(struct mdio_device *mdiodev) return err; err = mdiobus_register_reset(mdiodev); - if (err) + if (err) { + gpiod_put(mdiodev->reset_gpio); + mdiodev->reset_gpio = NULL; return err; + } /* Assert the reset signal */ mdio_device_reset(mdiodev, 1); -- 2.51.0