]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
phy: core: Fix an OF node refcount leakage in _of_phy_get()
authorZijun Hu <quic_zijuhu@quicinc.com>
Fri, 13 Dec 2024 12:36:44 +0000 (20:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 2 Jan 2025 09:30:49 +0000 (10:30 +0100)
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@vger.kernel.org
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20241213-phy_core_fix-v6-4-40ae28f5015a@quicinc.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/phy/phy-core.c

index d93ddf1262c5178b2d1ad3509a0d1213b0924ba5..c88769e1bcca3039b4386875eb6e11ca9081407d 100644 (file)
@@ -575,8 +575,10 @@ static struct phy *_of_phy_get(struct device_node *np, int index)
                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);
@@ -598,6 +600,7 @@ out_put_module:
 
 out_unlock:
        mutex_unlock(&phy_provider_mutex);
+out_put_node:
        of_node_put(args.np);
 
        return phy;