Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795058044; b=3kOvZC8U0R2Y/CMI+4gm3Q2HK1eVt8URnhww+buMXhEnrcG//lyJCbmWx4vKKi/v8uCl h0bJb2B4xc5dDVnNykyikcAtENAf3DDF6u41+dpy+2uvtc+Z8DSxS6LH5vfL+tAUyguID RoiQyQQFgPE9ZolM/3jF1AdJiW+jfi5eHOzKGM2IOSbzRRiKRZuKdH4jTql+hr7ixQDVV 75ubPGdGttcTVuWyVx+8GkU6DwVvorMX8U2tRGfS+YeQeyGRT9lnJOc8J94mYcdZBLusB is4zhvbEz87HWX9V6JX5mDJ06vaNHNWxrY5dNQmhBP7OKwybtyvDFprWq4yAU+8qMLQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795058044; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=StrQkEuMCrhgJWlJLGNUAt+wkGgkfsWl092PNjXRq+M=; b=QKeFnYAGtw1+/hWkcoLgjaeeOZse5EcTPVE9cP24bjCGj9T8V/yY9yUAmI7lZUs6dLGz Jp2e1/UAwTDPLyTaKe84dH8VOleUfnUnX8BWffdOTPiulvRQJj5iY3+QFNR9+FnHiieEZ 5XA21qfw/16hV8Fj4+RoM4WkhKAsGfA8s4Io0D/JUf3NQx47seFZ1CiLwCif2QBHKgg1M XOXWIplrMZxuvtRUVlkDcQg+P4P5G4N6BUTsSeESmASCHVHxmItBNjLHyNSHd1GgavRra o5N1mMpSty83024gDoLO6crFI9O/mqA5r3RfnYANjs+zDAy8NN9tE+LUodcItdlvf/w== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0XnlQtfw; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CDF6D606A320; Thu, 19 Nov 2026 03:14:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=0XnlQtfw Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA3AD1F000C4; Thu, 19 Nov 2026 03:14:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795058044; bh=StrQkEuMCrhgJWlJLGNUAt+wkGgkfsWl092PNjXRq+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=0XnlQtfwhptCRcTXsBa/3nNVk+5kyAauxeWvXI89BbGyvRGv44+RRRtUTlSPK+n2/ hus5geV6eVdFRsff+orXMIpTGacNGd5DSZdZyfD57SmTrqpU3mBgAmUQoIZqq5GfXH ZAelo+fLUwGe/izpRTxtFXt2Trzj3MxvXrFmE/AA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Manivannan Sadhasivam , Loic Poulain , Bryan ODonoghue , Vinod Koul , Sasha Levin , Oleg Keri Subject: [PATCH 5.10 0344/1848] phy: core: Fix race-condition between _of_phy_get() and try_module_get() Date: Wed, 18 Nov 2026 15:39:42 +0100 Message-ID: <20261118145926.979471892@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Bryan O'Donoghue [ Upstream commit 090055ee629523092688da42428558ba56d4272f ] Sashiko asked during a patch review if the existing usage pattern had a race condition; specifically in of_phy_get() if it was possible between returning from _of_phy_get() and running try_module_get() that a module might be unbound leading to use-after-free. Looking at the code this appears to be so, there is no linkage between the phy and module under a synchronisation primitive. Using the phy_provider_mutex in phy_get() will ensure there is a link between the returned phy pointer and the module_get() bumping the module reference count. Amend phy_get(), of_phy_get() and devm_of_phy_get_by_index() to fix the same usage pattern. phy_provider_unregister() must take the phy_provider_mutex so amending phy_get()/of_phy_get() to take that same mutex guarantees there is no use-after-free. Fixes: ff764963479a1 ("drivers: phy: add generic PHY framework") Cc: stable@vger.kernel.org Reviewed-by: Manivannan Sadhasivam Reviewed-by: Loic Poulain Tested-by: Oleg Keri # Lenovo Yoga Slim 7x Gen 11 (Glymur) Signed-off-by: Bryan O'Donoghue Link: https://patch.msgid.link/20260918-b4-linux-next-25-03-13-dtsi-x1e80100-camss-v20-1-dc244e124e71@linaro.org Signed-off-by: Vinod Koul [ sashal: Placed mutex acquisition after the existing NULL-name rejection in phy_get(), preserving its direct error return. ] Signed-off-by: Sasha Levin --- drivers/phy/phy-core.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c index dac0f7f4f3d3d..5bd96f11bb467 100644 --- a/drivers/phy/phy-core.c +++ b/drivers/phy/phy-core.c @@ -117,13 +117,13 @@ static struct phy *phy_find(struct device *dev, const char *con_id) const char *dev_id = dev_name(dev); struct phy_lookup *p, *pl = NULL; - mutex_lock(&phy_provider_mutex); + lockdep_assert_held(&phy_provider_mutex); + list_for_each_entry(p, &phys, node) if (!strcmp(p->dev_id, dev_id) && !strcmp(p->con_id, con_id)) { pl = p; break; } - mutex_unlock(&phy_provider_mutex); return pl ? pl->phy : ERR_PTR(-ENODEV); } @@ -504,6 +504,8 @@ static struct phy *_of_phy_get(struct device_node *np, int index) struct phy *phy = NULL; struct of_phandle_args args; + lockdep_assert_held(&phy_provider_mutex); + ret = of_parse_phandle_with_args(np, "phys", "#phy-cells", index, &args); if (ret) @@ -515,11 +517,10 @@ static struct phy *_of_phy_get(struct device_node *np, int index) goto out_put_node; } - mutex_lock(&phy_provider_mutex); phy_provider = of_phy_provider_lookup(args.np); if (IS_ERR(phy_provider) || !try_module_get(phy_provider->owner)) { phy = ERR_PTR(-EPROBE_DEFER); - goto out_unlock; + goto out_put_node; } if (!of_device_is_available(args.np)) { @@ -533,8 +534,6 @@ static struct phy *_of_phy_get(struct device_node *np, int index) out_put_module: module_put(phy_provider->owner); -out_unlock: - mutex_unlock(&phy_provider_mutex); out_put_node: of_node_put(args.np); @@ -558,15 +557,21 @@ struct phy *of_phy_get(struct device_node *np, const char *con_id) if (con_id) index = of_property_match_string(np, "phy-names", con_id); + mutex_lock(&phy_provider_mutex); + phy = _of_phy_get(np, index); if (IS_ERR(phy)) - return phy; + goto out_unlock; - if (!try_module_get(phy->ops->owner)) - return ERR_PTR(-EPROBE_DEFER); + if (!try_module_get(phy->ops->owner)) { + phy = ERR_PTR(-EPROBE_DEFER); + goto out_unlock; + } get_device(&phy->dev); +out_unlock: + mutex_unlock(&phy_provider_mutex); return phy; } EXPORT_SYMBOL_GPL(of_phy_get); @@ -678,6 +683,7 @@ struct phy *phy_get(struct device *dev, const char *string) return ERR_PTR(-EINVAL); } + mutex_lock(&phy_provider_mutex); if (dev->of_node) { index = of_property_match_string(dev->of_node, "phy-names", string); @@ -686,10 +692,12 @@ struct phy *phy_get(struct device *dev, const char *string) phy = phy_find(dev, string); } if (IS_ERR(phy)) - return phy; + goto out_unlock; - if (!try_module_get(phy->ops->owner)) - return ERR_PTR(-EPROBE_DEFER); + if (!try_module_get(phy->ops->owner)) { + phy = ERR_PTR(-EPROBE_DEFER); + goto out_unlock; + } get_device(&phy->dev); @@ -698,6 +706,8 @@ struct phy *phy_get(struct device *dev, const char *string) dev_dbg(dev, "failed to create device link to %s\n", dev_name(phy->dev.parent)); +out_unlock: + mutex_unlock(&phy_provider_mutex); return phy; } EXPORT_SYMBOL_GPL(phy_get); @@ -837,15 +847,17 @@ struct phy *devm_of_phy_get_by_index(struct device *dev, struct device_node *np, if (!ptr) return ERR_PTR(-ENOMEM); + mutex_lock(&phy_provider_mutex); phy = _of_phy_get(np, index); if (IS_ERR(phy)) { devres_free(ptr); - return phy; + goto out_unlock; } if (!try_module_get(phy->ops->owner)) { devres_free(ptr); - return ERR_PTR(-EPROBE_DEFER); + phy = ERR_PTR(-EPROBE_DEFER); + goto out_unlock; } get_device(&phy->dev); @@ -858,6 +870,8 @@ struct phy *devm_of_phy_get_by_index(struct device *dev, struct device_node *np, dev_dbg(dev, "failed to create device link to %s\n", dev_name(phy->dev.parent)); +out_unlock: + mutex_unlock(&phy_provider_mutex); return phy; } EXPORT_SYMBOL_GPL(devm_of_phy_get_by_index); -- 2.53.0