summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBuday Csaba <buday.csaba@prolan.hu>2025-11-08 09:49:22 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-11-24 12:35:51 +0300
commit3c5451eef231f80847e167005ed94a9ed4fc3ba1 (patch)
tree27d10a35bd21a7df6f2b563ce830c7d7ef7822c7
parentf0104977fed25ebe001fd63dab2b6b7fefad3373 (diff)
downloadlinux-3c5451eef231f80847e167005ed94a9ed4fc3ba1.tar.xz
net: mdio: fix resource leak in mdiobus_register_device()
[ 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 <buday.csaba@prolan.hu> Link: https://patch.msgid.link/4b419377f8dd7d2f63f919d0f74a336c734f8fff.1762584481.git.buday.csaba@prolan.hu Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/phy/mdio_bus.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index a508cd81cd4e..d80b80ba20a1 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -79,8 +79,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);