From: Zijun Hu <zijun_hu@icloud.com>
To: Vinod Koul <vkoul@kernel.org>,
Kishon Vijay Abraham I <kishon@kernel.org>,
Felipe Balbi <balbi@ti.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Rob Herring <robh@kernel.org>, Arnd Bergmann <arnd@arndb.de>,
Lee Jones <lee@kernel.org>
Cc: Zijun Hu <zijun_hu@icloud.com>,
stable@vger.kernel.org, linux-phy@lists.infradead.org,
netdev@vger.kernel.org, linux-pci@vger.kernel.org,
linux-kernel@vger.kernel.org, Zijun Hu <quic_zijuhu@quicinc.com>
Subject: [PATCH 4/6] phy: core: Add missing of_node_put() for an error handling path of _of_phy_get()
Date: Sun, 20 Oct 2024 13:27:49 +0800 [thread overview]
Message-ID: <20241020-phy_core_fix-v1-4-078062f7da71@quicinc.com> (raw)
In-Reply-To: <20241020-phy_core_fix-v1-0-078062f7da71@quicinc.com>
From: Zijun Hu <quic_zijuhu@quicinc.com>
It is wrong for _of_phy_get() not to decrease the OF node refcount which
was increased by previous of_parse_phandle_with_args() when returns due to
of_device_is_compatible() error.
Fixed by adding of_node_put() before the error return.
Fixes: b7563e2796f8 ("phy: work around 'phys' references to usb-nop-xceiv devices")
Cc: stable@vger.kernel.org
Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
---
drivers/phy/phy-core.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 52ca590a58b9..967878b78797 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -629,8 +629,11 @@ 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"))
+ if (of_device_is_compatible(args.np, "usb-nop-xceiv")) {
+ /* Put refcount above of_parse_phandle_with_args() got */
+ of_node_put(args.np);
return ERR_PTR(-ENODEV);
+ }
mutex_lock(&phy_provider_mutex);
phy_provider = of_phy_provider_lookup(args.np);
--
2.34.1
next prev parent reply other threads:[~2024-10-20 5:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-20 5:27 [PATCH 0/6] phy: core: Fix bugs for several APIs and simplify an API Zijun Hu
2024-10-20 5:27 ` [PATCH 1/6] phy: core: Fix API devm_phy_put() can not release the phy Zijun Hu
2024-10-20 5:27 ` [PATCH 2/6] phy: core: Fix API devm_of_phy_provider_unregister() can not unregister the phy provider Zijun Hu
2024-10-20 5:27 ` [PATCH 3/6] phy: core: Fix API devm_phy_destroy() can not destroy the phy Zijun Hu
2024-10-20 5:27 ` Zijun Hu [this message]
2024-10-20 5:27 ` [PATCH 5/6] phy: core: Add missing of_node_put() in of_phy_provider_lookup() Zijun Hu
2024-10-20 7:23 ` Christophe JAILLET
2024-10-20 8:18 ` Zijun Hu
2024-10-20 5:27 ` [PATCH 6/6] phy: core: Simplify API of_phy_simple_xlate() implementation Zijun Hu
2024-10-20 10:19 ` Zijun Hu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241020-phy_core_fix-v1-4-078062f7da71@quicinc.com \
--to=zijun_hu@icloud.com \
--cc=arnd@arndb.de \
--cc=balbi@ti.com \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@kernel.org \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-phy@lists.infradead.org \
--cc=netdev@vger.kernel.org \
--cc=quic_zijuhu@quicinc.com \
--cc=robh@kernel.org \
--cc=stable@vger.kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox