From nobody Thu Apr 16 07:08:33 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB486183CC3; Mon, 2 Mar 2026 00:27:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772411278; cv=none; b=jownyKb4FWOslzpL+kqc+2/u/crEh3SabMza+xQwJ/wF1++uqfxHuba7cC9wi5rbF6p/WuiSFE8BZBTX0MoxMcN8qUjvbMgSpXEtirlUDrIM6ZAzhEAOadiTA2Rnadl1vQXVuvo5SrESft054P8Kek5WngNJJln2yYGUusSHezI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772411278; c=relaxed/simple; bh=A5yanP5RSMw/V1kPO6P8wRGbSTHC1RAwVLFh5EBAlDE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ImY/bXf2NOHslW9HRuOU+YiGGJhlTheCfCmedhsyb4VCRr0L3lRoj3HqGHSpCfbjUr0MS3WS+ihMcgggpLfb7j8rut3MxUTzWFQSXN8BH6QCmZiEa72ZBmx+sWHaZeSrSroC0FxXqe3cik97F3pf+kV/LOCtioO919SiwjTEKzM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C/YZJQ0m; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C/YZJQ0m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE99CC19422; Mon, 2 Mar 2026 00:27:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772411278; bh=A5yanP5RSMw/V1kPO6P8wRGbSTHC1RAwVLFh5EBAlDE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/YZJQ0m3Bp6U5Tr0EMZzGKgUwg68nprG2ExAJAXTS776DqQ3Qb8U4c3JTCbZTxlC 3v9jW0zAf6e68uufzm7+v86LP0qlXh/BczOsgaISAMXvJdjcRdLLR6TYTWbdFVwfb1 dLhKVJ4vF27ndwrYLSON8ffm0Iz901b7aFmD+kEQINH8yROco+68oFEzSFnk608Ca/ SUnUm84a/iW3V//5ITN0noSTlEh7X0vbE6HTntHscnt+CjqRxxKgb+RQ3x+CIp2Gno dxFSngkOMZ1h+TrYWzyPGSxzWvzbw4pmaYWtO69wygwEQR5Ion3R4cLXjGK7ZbWgqH emKrp9zzpF6MQ== From: Danilo Krummrich To: gregkh@linuxfoundation.org, rafael@kernel.org, hanguidong02@gmail.com, ysato@users.sourceforge.jp, dalias@libc.org, glaubitz@physik.fu-berlin.de, abelvesa@kernel.org, srini@kernel.org, s.nawrocki@samsung.com, nuno.sa@analog.com Cc: driver-core@lists.linux.dev, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-hwmon@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-sh@vger.kernel.org, Danilo Krummrich Subject: [PATCH 1/3] driver core: generalize driver_override in struct device Date: Mon, 2 Mar 2026 01:25:56 +0100 Message-ID: <20260302002729.19438-2-dakr@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302002729.19438-1-dakr@kernel.org> References: <20260302002729.19438-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently, there are 12 busses (including platform and PCI) that duplicate the driver_override logic for their individual devices. All of them seem to be prone to the bug described in [1]. While this could be solved for every bus individually using a separate lock, solving this in the driver-core generically results in less (and cleaner) changes overall. Thus, move driver_override to struct device, provide corresponding accessors for busses and handle locking with a separate lock internally. In particular, add device_set_driver_override(), device_has_driver_override(), device_match_driver_override() and a helper, DEVICE_ATTR_DRIVER_OVERRIDE(), to declare the corresponding sysfs store() and show() callbacks. Until all busses have migrated, keep driver_set_override() in place. Note that we can't use the device lock for the reasons described in [2]. Link: https://bugzilla.kernel.org/show_bug.cgi?id=3D220789 [1] Link: https://lore.kernel.org/driver-core/DGRGTIRHA62X.3RY09D9SOK77P@kernel= .org/ [2] Signed-off-by: Danilo Krummrich Reviewed-by: Gui-Dong Han Tested-by: Gui-Dong Han --- drivers/base/core.c | 2 ++ drivers/base/dd.c | 60 +++++++++++++++++++++++++++++++ include/linux/device.h | 81 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 143 insertions(+) diff --git a/drivers/base/core.c b/drivers/base/core.c index 791f9e444df8..a8cb90577d10 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -2566,6 +2566,7 @@ static void device_release(struct kobject *kobj) else WARN(1, KERN_ERR "Device '%s' does not have a release() function, it is = broken and must be fixed. See Documentation/core-api/kobject.rst.\n", dev_name(dev)); + kfree(dev->driver_override.name); kfree(p); } =20 @@ -3159,6 +3160,7 @@ void device_initialize(struct device *dev) kobject_init(&dev->kobj, &device_ktype); INIT_LIST_HEAD(&dev->dma_pools); mutex_init(&dev->mutex); + spin_lock_init(&dev->driver_override.lock); lockdep_set_novalidate_class(&dev->mutex); spin_lock_init(&dev->devres_lock); INIT_LIST_HEAD(&dev->devres_head); diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 0354f209529c..697e36e63cab 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -381,6 +381,66 @@ static void __exit deferred_probe_exit(void) } __exitcall(deferred_probe_exit); =20 +int __device_set_driver_override(struct device *dev, const char *s, size_t= len) +{ + const char *new, *old; + char *cp; + + if (!s) + return -EINVAL; + + /* + * The stored value will be used in sysfs show callback (sysfs_emit()), + * which has a length limit of PAGE_SIZE and adds a trailing newline. + * Thus we can store one character less to avoid truncation during sysfs + * show. + */ + if (len >=3D (PAGE_SIZE - 1)) + return -EINVAL; + + /* + * Compute the real length of the string in case userspace sends us a + * bunch of \0 characters like python likes to do. + */ + len =3D strlen(s); + + if (!len) { + /* Empty string passed - clear override */ + spin_lock(&dev->driver_override.lock); + old =3D dev->driver_override.name; + dev->driver_override.name =3D NULL; + spin_unlock(&dev->driver_override.lock); + kfree(old); + + return 0; + } + + cp =3D strnchr(s, len, '\n'); + if (cp) + len =3D cp - s; + + new =3D kstrndup(s, len, GFP_KERNEL); + if (!new) + return -ENOMEM; + + spin_lock(&dev->driver_override.lock); + old =3D dev->driver_override.name; + if (cp !=3D s) { + dev->driver_override.name =3D new; + spin_unlock(&dev->driver_override.lock); + } else { + /* "\n" passed - clear override */ + dev->driver_override.name =3D NULL; + spin_unlock(&dev->driver_override.lock); + + kfree(new); + } + kfree(old); + + return 0; +} +EXPORT_SYMBOL_GPL(__device_set_driver_override); + /** * device_is_bound() - Check if device is bound to a driver * @dev: device to check diff --git a/include/linux/device.h b/include/linux/device.h index 0be95294b6e6..4599156d5cbd 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -266,6 +266,33 @@ ssize_t device_show_string(struct device *dev, struct = device_attribute *attr, struct dev_ext_attribute dev_attr_##_name =3D \ { __ATTR(_name, (_mode) & ~0222, device_show_string, NULL), (_var) } =20 +/** + * DEVICE_ATTR_DRIVER_OVERRIDE - Define sysfs driver_override attribute ca= llbacks + * + * Generates the standard driver_override_show() and driver_override_store= () + * sysfs callbacks and the static DEVICE_ATTR_RW(driver_override) declarat= ion. + */ +#define DEVICE_ATTR_DRIVER_OVERRIDE() \ +static ssize_t driver_override_store(struct device *dev, \ + struct device_attribute *attr, \ + const char *buf, size_t count) \ +{ \ + int ret; \ + \ + ret =3D __device_set_driver_override(dev, buf, count); \ + if (ret) \ + return ret; \ + \ + return count; \ +} \ +static ssize_t driver_override_show(struct device *dev, \ + struct device_attribute *attr, char *buf) \ +{ \ + guard(spinlock)(&dev->driver_override.lock); \ + return sysfs_emit(buf, "%s\n", dev->driver_override.name); \ +} \ +static DEVICE_ATTR_RW(driver_override) + #define DEVICE_ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) \ struct device_attribute dev_attr_##_name =3D \ __ATTR_IGNORE_LOCKDEP(_name, _mode, _show, _store) @@ -483,6 +510,8 @@ struct device_physical_location { * on. This shrinks the "Board Support Packages" (BSPs) and * minimizes board-specific #ifdefs in drivers. * @driver_data: Private pointer for driver specific info. + * @driver_override: Driver name to force a match. Do not touch directly;= use + * device_set_driver_override() instead. * @links: Links to suppliers and consumers of this device. * @power: For device power management. * See Documentation/driver-api/pm/devices.rst for details. @@ -576,6 +605,10 @@ struct device { core doesn't touch it */ void *driver_data; /* Driver data, set and get with dev_set_drvdata/dev_get_drvdata */ + struct { + const char *name; + spinlock_t lock; + } driver_override; struct mutex mutex; /* mutex to synchronize calls to * its driver. */ @@ -701,6 +734,54 @@ struct device_link { =20 #define kobj_to_dev(__kobj) container_of_const(__kobj, struct device, kobj) =20 +int __device_set_driver_override(struct device *dev, const char *s, size_t= len); + +/** + * device_set_driver_override() - Helper to set or clear driver override. + * @dev: Device to change + * @s: NUL-terminated string, new driver name to force a match, pass empty + * string to clear it ("" or "\n", where the latter is only for sysfs + * interface). + * + * Helper to set or clear driver override of a device. + * + * Returns: 0 on success or a negative error code on failure. + */ +static inline int device_set_driver_override(struct device *dev, const cha= r *s) +{ + return __device_set_driver_override(dev, s, strlen(s)); +} + +/** + * device_has_driver_override() - Check if a driver override has been set. + * @dev: device to check + * + * Returns true if a driver override has been set for this device. + */ +static inline bool device_has_driver_override(struct device *dev) +{ + guard(spinlock)(&dev->driver_override.lock); + return !!dev->driver_override.name; +} + +/** + * device_match_driver_override() - Match a driver against the device's dr= iver_override. + * @dev: device to check + * @drv: driver to match against + * + * Returns > 0 if a driver override is set and matches the given driver, 0= if a + * driver override is set but does not match, or < 0 if a driver override = is not + * set at all. + */ +static inline int device_match_driver_override(struct device *dev, + const struct device_driver *drv) +{ + guard(spinlock)(&dev->driver_override.lock); + if (dev->driver_override.name) + return !strcmp(dev->driver_override.name, drv->name); + return -1; +} + /** * device_iommu_mapped - Returns true when the device DMA is translated * by an IOMMU --=20 2.53.0 From nobody Thu Apr 16 07:08:33 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E2B9C183CC3; Mon, 2 Mar 2026 00:28:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772411283; cv=none; b=ZmOs13BJpExysLGX6mbZ1Wx//L0qhje3L0mUVq/5OrhgklpulTJbqLBneI8Tq20OkjgAyYWSYG2N5s3sSYZs2TZ7RN1cHpvRkX5mKkwcIBJTBnyyy8bNR+s2uutrQlQ6gU207nc3AYGgLIon0/cVtd/1Lt5dBhinjZHdpNWfeSk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772411283; c=relaxed/simple; bh=mpHa2etVTegNvRHxQPUatcpwMpSIUumnV/toW8Oz2rQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NUcqPTNyh961J+szQFw7jAH63oIHynx5Hv1YFerRKE5Cg9naVF5CstPx4Mfsrwu6GE0fkLPr3It3uYpQ0VU/ItbOCyXY1QD0aepo71Iq79OxNTEQ9+WM7Xd2oRvEShdLl/1FGlRDPub1N7PMRCbIMRMBRJwsfruFGWhpV5j2R1E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NzvW44r+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NzvW44r+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D51B4C2BC9E; Mon, 2 Mar 2026 00:27:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772411282; bh=mpHa2etVTegNvRHxQPUatcpwMpSIUumnV/toW8Oz2rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NzvW44r+tVFEDwhwm8qNt48B77/fjOA1FiiN0NiiW23HKHSZgHmobL8ISZNmLbybk Av8JV4lqJsFoawidt9D7yLlDywdn7zh6xblJvnPnONifm4CJG/GkaL5EGFSdOBoRE6 qM1NJpPiY5TMk5eDaXS1WfIS/6HeFvSOgpox09Rfos7qxJTaF1MGLtvS1+9nXg6NAB WiOiwfzSMZG7DsfN5nUff9lxJ7INFLuzq9qJ9pWDjRXr0I+7YakqFwxiCLv5gSYHwE wC7tk1/bQKCGLBcy5HYW/zMqLYUXqKxIzL79qCQgFG0woRs316+iW9OXs2daF0PmSN AxAOtkhUWHbig== From: Danilo Krummrich To: gregkh@linuxfoundation.org, rafael@kernel.org, hanguidong02@gmail.com, ysato@users.sourceforge.jp, dalias@libc.org, glaubitz@physik.fu-berlin.de, abelvesa@kernel.org, srini@kernel.org, s.nawrocki@samsung.com, nuno.sa@analog.com Cc: driver-core@lists.linux.dev, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-hwmon@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-sh@vger.kernel.org, Danilo Krummrich Subject: [PATCH 2/3] hwmon: axi-fan: don't use driver_override as IRQ name Date: Mon, 2 Mar 2026 01:25:57 +0100 Message-ID: <20260302002729.19438-3-dakr@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302002729.19438-1-dakr@kernel.org> References: <20260302002729.19438-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Do not use driver_override as IRQ name, as it is not guaranteed to point to a valid string; use dev_name() instead. Fixes: 8412b410fa5e ("hwmon: Support ADI Fan Control IP") Signed-off-by: Danilo Krummrich --- drivers/hwmon/axi-fan-control.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwmon/axi-fan-control.c b/drivers/hwmon/axi-fan-contro= l.c index b7bb325c3ad9..ec4bbb104449 100644 --- a/drivers/hwmon/axi-fan-control.c +++ b/drivers/hwmon/axi-fan-control.c @@ -507,7 +507,7 @@ static int axi_fan_control_probe(struct platform_device= *pdev) ret =3D devm_request_threaded_irq(&pdev->dev, ctl->irq, NULL, axi_fan_control_irq_handler, IRQF_ONESHOT | IRQF_TRIGGER_HIGH, - pdev->driver_override, ctl); + dev_name(&pdev->dev), ctl); if (ret) return dev_err_probe(&pdev->dev, ret, "failed to request an irq\n"); --=20 2.53.0 From nobody Thu Apr 16 07:08:33 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D01A01D7E41; Mon, 2 Mar 2026 00:28:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772411286; cv=none; b=kyuAKAZAhEBVlhf7vaI39AGsPvajPs5pdGLu6qMJ0Z8qcYEPi/NGxAorfeymf7t2qeIFdD7OeRZos6p3QyO4d+pwHVDhgxoMnRHX+LSlIGjKlVeFty7IlnVQT8Gkv04oyb3UDoViSKh+jul9ulADFmDw81sa6Uq+ckqLoLK89/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772411286; c=relaxed/simple; bh=zlvrhlx/EjA3BdLSQUT+ZWXnRIIRH4KVYqPd4X0vsCI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uqiKd5SO6Rn2tI4YVV3uSgDre2XzftK4sb9Trhpt/c1vZqxA/S9PLxIdbVJ7BntYxWlnL1hCYXXiOfC2PTlsY4zLe61AEd+TG2QM81R4JkTWMsHURIUd9eNSFHTnSIv6CFLMEBoPcSMUd8jysUG+hSM5YFVhfbh2y7M3uoOxWwY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZFEgcByT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZFEgcByT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 15E3CC116C6; Mon, 2 Mar 2026 00:28:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772411286; bh=zlvrhlx/EjA3BdLSQUT+ZWXnRIIRH4KVYqPd4X0vsCI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZFEgcByTE5ORBprx0RnqWmbUmE5Sq5+MHOwJzPBz7Q4NNvqYbz+W4JPtNZnbQH4ff y+P39Bfu/x9/SnWVaQUNVuWO29/TDeG9qzFNckwUQqqCeN2N2Kz0NOyJLqUJUSp0aI 5h9JxFlptDo28MKx0QAZA3H5l78O8LzK2opCov5ROHdthHEAYHdBYFQES1BaMEpo4c fx2Dqj4NN6xUr5dopk9Ah9f0ppyo0nBaiDkQs5vygcco4us2af2tsMYAgKm84MxSQi 1yrSNMpmUr8rNmu67y96R04G2OnoMzYNlTjNVCLHuh+QojXm1bf62tMhjh+Vlp9I5U pDVuLZgnwg8Jg== From: Danilo Krummrich To: gregkh@linuxfoundation.org, rafael@kernel.org, hanguidong02@gmail.com, ysato@users.sourceforge.jp, dalias@libc.org, glaubitz@physik.fu-berlin.de, abelvesa@kernel.org, srini@kernel.org, s.nawrocki@samsung.com, nuno.sa@analog.com Cc: driver-core@lists.linux.dev, linux-kernel@vger.kernel.org, imx@lists.linux.dev, linux-hwmon@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-sound@vger.kernel.org, linux-sh@vger.kernel.org, Danilo Krummrich Subject: [PATCH 3/3] driver core: platform: use generic driver_override infrastructure Date: Mon, 2 Mar 2026 01:25:58 +0100 Message-ID: <20260302002729.19438-4-dakr@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260302002729.19438-1-dakr@kernel.org> References: <20260302002729.19438-1-dakr@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When a driver is probed through __driver_attach(), the bus' match() callback is called without the device lock held, thus accessing the driver_override field without a lock, which can cause a UAF. Fix this by using the driver-core driver_override infrastructure taking care of proper locking internally. Note that calling match() from __driver_attach() without the device lock held is intentional. [1] Link: https://lore.kernel.org/driver-core/DGRGTIRHA62X.3RY09D9SOK77P@kernel= .org/ [1] Reported-by: Gui-Dong Han Closes: https://bugzilla.kernel.org/show_bug.cgi?id=3D220789 Fixes: 3d713e0e382e ("driver core: platform: add device binding path 'drive= r_override'") Signed-off-by: Danilo Krummrich Reviewed-by: Gui-Dong Han --- arch/sh/drivers/platform_early.c | 6 ++++-- drivers/base/platform.c | 35 +++++--------------------------- drivers/bus/simple-pm-bus.c | 4 ++-- drivers/clk/imx/clk-scu.c | 3 +-- drivers/slimbus/qcom-ngd-ctrl.c | 6 ++---- include/linux/platform_device.h | 5 ----- sound/soc/samsung/i2s.c | 6 +++--- 7 files changed, 17 insertions(+), 48 deletions(-) diff --git a/arch/sh/drivers/platform_early.c b/arch/sh/drivers/platform_ea= rly.c index 143747c45206..3cd17bb0be67 100644 --- a/arch/sh/drivers/platform_early.c +++ b/arch/sh/drivers/platform_early.c @@ -25,10 +25,12 @@ static int platform_match(struct device *dev, struct de= vice_driver *drv) { struct platform_device *pdev =3D to_platform_device(dev); struct platform_driver *pdrv =3D to_platform_driver(drv); + int ret; =20 /* When driver_override is set, only bind to the matching driver */ - if (pdev->driver_override) - return !strcmp(pdev->driver_override, drv->name); + ret =3D device_match_driver_override(dev, drv); + if (ret >=3D 0) + return ret; =20 /* Then try to match against the id table */ if (pdrv->id_table) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index b45d41b018ca..22ae87921a7a 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -603,7 +603,6 @@ static void platform_device_release(struct device *dev) kfree(pa->pdev.dev.platform_data); kfree(pa->pdev.mfd_cell); kfree(pa->pdev.resource); - kfree(pa->pdev.driver_override); kfree(pa); } =20 @@ -1306,33 +1305,7 @@ static ssize_t numa_node_show(struct device *dev, } static DEVICE_ATTR_RO(numa_node); =20 -static ssize_t driver_override_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - struct platform_device *pdev =3D to_platform_device(dev); - ssize_t len; - - device_lock(dev); - len =3D sysfs_emit(buf, "%s\n", pdev->driver_override); - device_unlock(dev); - - return len; -} - -static ssize_t driver_override_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) -{ - struct platform_device *pdev =3D to_platform_device(dev); - int ret; - - ret =3D driver_set_override(dev, &pdev->driver_override, buf, count); - if (ret) - return ret; - - return count; -} -static DEVICE_ATTR_RW(driver_override); +DEVICE_ATTR_DRIVER_OVERRIDE(); =20 static struct attribute *platform_dev_attrs[] =3D { &dev_attr_modalias.attr, @@ -1377,10 +1350,12 @@ static int platform_match(struct device *dev, const= struct device_driver *drv) { struct platform_device *pdev =3D to_platform_device(dev); struct platform_driver *pdrv =3D to_platform_driver(drv); + int ret; =20 /* When driver_override is set, only bind to the matching driver */ - if (pdev->driver_override) - return !strcmp(pdev->driver_override, drv->name); + ret =3D device_match_driver_override(dev, drv); + if (ret >=3D 0) + return ret; =20 /* Attempt an OF style match first */ if (of_driver_match_device(dev, drv)) diff --git a/drivers/bus/simple-pm-bus.c b/drivers/bus/simple-pm-bus.c index 3f00d953fb9a..c920bd6fbaaf 100644 --- a/drivers/bus/simple-pm-bus.c +++ b/drivers/bus/simple-pm-bus.c @@ -36,7 +36,7 @@ static int simple_pm_bus_probe(struct platform_device *pd= ev) * that's not listed in simple_pm_bus_of_match. We don't want to do any * of the simple-pm-bus tasks for these devices, so return early. */ - if (pdev->driver_override) + if (device_has_driver_override(&pdev->dev)) return 0; =20 match =3D of_match_device(dev->driver->of_match_table, dev); @@ -78,7 +78,7 @@ static void simple_pm_bus_remove(struct platform_device *= pdev) { const void *data =3D of_device_get_match_data(&pdev->dev); =20 - if (pdev->driver_override || data) + if (device_has_driver_override(&pdev->dev) || data) return; =20 dev_dbg(&pdev->dev, "%s\n", __func__); diff --git a/drivers/clk/imx/clk-scu.c b/drivers/clk/imx/clk-scu.c index a85ec48a798b..9b33df9967ec 100644 --- a/drivers/clk/imx/clk-scu.c +++ b/drivers/clk/imx/clk-scu.c @@ -706,8 +706,7 @@ struct clk_hw *imx_clk_scu_alloc_dev(const char *name, if (ret) goto put_device; =20 - ret =3D driver_set_override(&pdev->dev, &pdev->driver_override, - "imx-scu-clk", strlen("imx-scu-clk")); + ret =3D device_set_driver_override(&pdev->dev, "imx-scu-clk"); if (ret) goto put_device; =20 diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctr= l.c index 9aa7218b4e8d..1ed6be6e85d2 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1535,10 +1535,8 @@ static int of_qcom_slim_ngd_register(struct device *= parent, ngd->id =3D id; ngd->pdev->dev.parent =3D parent; =20 - ret =3D driver_set_override(&ngd->pdev->dev, - &ngd->pdev->driver_override, - QCOM_SLIM_NGD_DRV_NAME, - strlen(QCOM_SLIM_NGD_DRV_NAME)); + ret =3D device_set_driver_override(&ngd->pdev->dev, + QCOM_SLIM_NGD_DRV_NAME); if (ret) { platform_device_put(ngd->pdev); kfree(ngd); diff --git a/include/linux/platform_device.h b/include/linux/platform_devic= e.h index 813da101b5bf..ed1d50d1c3c1 100644 --- a/include/linux/platform_device.h +++ b/include/linux/platform_device.h @@ -31,11 +31,6 @@ struct platform_device { struct resource *resource; =20 const struct platform_device_id *id_entry; - /* - * Driver name to force a match. Do not set directly, because core - * frees it. Use driver_set_override() to set or clear it. - */ - const char *driver_override; =20 /* MFD cell pointer */ struct mfd_cell *mfd_cell; diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index e9964f0e010a..140907a41a70 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -1360,10 +1360,10 @@ static int i2s_create_secondary_device(struct samsu= ng_i2s_priv *priv) if (!pdev_sec) return -ENOMEM; =20 - pdev_sec->driver_override =3D kstrdup("samsung-i2s", GFP_KERNEL); - if (!pdev_sec->driver_override) { + ret =3D device_set_driver_override(&pdev_sec->dev, "samsung-i2s"); + if (ret) { platform_device_put(pdev_sec); - return -ENOMEM; + return ret; } =20 ret =3D platform_device_add(pdev_sec); --=20 2.53.0