From: Zijun Hu <quic_zijuhu@xxxxxxxxxxx>
commit 5ebdc6be16c2000e37fcb8b4072d442d268ad492 upstream.
_of_phy_get() will directly return when suffers of_device_is_compatible()
error, but it forgets to decrease refcount of OF node @args.np before error
return, the refcount was increased by previous of_parse_phandle_with_args()
so causes the OF node's refcount leakage.
Fix by decreasing the refcount via of_node_put() before the error return.
Fixes: b7563e2796f8 ("phy: work around 'phys' references to usb-nop-xceiv devices")
Cc: stable@xxxxxxxxxxxxxxx
Reviewed-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Signed-off-by: Zijun Hu <quic_zijuhu@xxxxxxxxxxx>
Link: https://lore.kernel.org/r/20241213-phy_core_fix-v6-4-40ae28f5015a@xxxxxxxxxxx
Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/phy/phy-core.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -507,8 +507,10 @@ static struct phy *_of_phy_get(struct de
return ERR_PTR(-ENODEV);
/* This phy type handled by the usb-phy subsystem for now */
- if (of_device_is_compatible(args.np, "usb-nop-xceiv"))
- return ERR_PTR(-ENODEV);
+ if (of_device_is_compatible(args.np, "usb-nop-xceiv")) {
+ phy = ERR_PTR(-ENODEV);
+ goto out_put_node;
+ }
mutex_lock(&phy_provider_mutex);
phy_provider = of_phy_provider_lookup(args.np);
@@ -530,6 +532,7 @@ out_put_module:
out_unlock:
mutex_unlock(&phy_provider_mutex);
+out_put_node:
of_node_put(args.np);
return phy;
Patches currently in stable-queue which might be from quic_zijuhu@xxxxxxxxxxx are
queue-5.4/phy-core-fix-that-api-devm_phy_destroy-fails-to-destroy-the-phy.patch
queue-5.4/phy-core-fix-an-of-node-refcount-leakage-in-of_phy_provider_lookup.patch
queue-5.4/of-irq-fix-using-uninitialized-variable-addr_len-in-api-of_irq_parse_one.patch
queue-5.4/phy-core-fix-an-of-node-refcount-leakage-in-_of_phy_get.patch
queue-5.4/phy-core-fix-that-api-devm_phy_put-fails-to-release-the-phy.patch
queue-5.4/of-fix-refcount-leakage-for-of-node-returned-by-__of_get_dma_parent.patch
