All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sasha Levin <sashal@kernel.org>,
	rafael@kernel.org, dakr@kernel.org
Subject: [PATCH AUTOSEL 6.14 15/39] driver core: fix potential NULL pointer dereference in dev_uevent()
Date: Tue, 29 Apr 2025 19:49:42 -0400	[thread overview]
Message-ID: <20250429235006.536648-15-sashal@kernel.org> (raw)
In-Reply-To: <20250429235006.536648-1-sashal@kernel.org>

From: Dmitry Torokhov <dmitry.torokhov@gmail.com>

[ Upstream commit 18daa52418e7e4629ed1703b64777294209d2622 ]

If userspace reads "uevent" device attribute at the same time as another
threads unbinds the device from its driver, change to dev->driver from a
valid pointer to NULL may result in crash. Fix this by using READ_ONCE()
when fetching the pointer, and take bus' drivers klist lock to make sure
driver instance will not disappear while we access it.

Use WRITE_ONCE() when setting the driver pointer to ensure there is no
tearing.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Link: https://lore.kernel.org/r/20250311052417.1846985-3-dmitry.torokhov@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/base/base.h | 13 ++++++++++++-
 drivers/base/bus.c  |  2 +-
 drivers/base/core.c | 33 +++++++++++++++++++++++++++++++--
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/drivers/base/base.h b/drivers/base/base.h
index eb203cf8370bc..123031a757d91 100644
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -73,6 +73,7 @@ static inline void subsys_put(struct subsys_private *sp)
 		kset_put(&sp->subsys);
 }
 
+struct subsys_private *bus_to_subsys(const struct bus_type *bus);
 struct subsys_private *class_to_subsys(const struct class *class);
 
 struct driver_private {
@@ -182,8 +183,18 @@ void device_driver_detach(struct device *dev);
 
 static inline void device_set_driver(struct device *dev, const struct device_driver *drv)
 {
+	/*
+	 * Majority (all?) read accesses to dev->driver happens either
+	 * while holding device lock or in bus/driver code that is only
+	 * invoked when the device is bound to a driver and there is no
+	 * concern of the pointer being changed while it is being read.
+	 * However when reading device's uevent file we read driver pointer
+	 * without taking device lock (so we do not block there for
+	 * arbitrary amount of time). We use WRITE_ONCE() here to prevent
+	 * tearing so that READ_ONCE() can safely be used in uevent code.
+	 */
 	// FIXME - this cast should not be needed "soon"
-	dev->driver = (struct device_driver *)drv;
+	WRITE_ONCE(dev->driver, (struct device_driver *)drv);
 }
 
 int devres_release_all(struct device *dev);
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 6b9e65a42cd2e..c8c7e08040249 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -57,7 +57,7 @@ static int __must_check bus_rescan_devices_helper(struct device *dev,
  * NULL.  A call to subsys_put() must be done when finished with the pointer in
  * order for it to be properly freed.
  */
-static struct subsys_private *bus_to_subsys(const struct bus_type *bus)
+struct subsys_private *bus_to_subsys(const struct bus_type *bus)
 {
 	struct subsys_private *sp = NULL;
 	struct kobject *kobj;
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 4a23dc8e2cdaf..e65728e99ae42 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2624,6 +2624,35 @@ static const char *dev_uevent_name(const struct kobject *kobj)
 	return NULL;
 }
 
+/*
+ * Try filling "DRIVER=<name>" uevent variable for a device. Because this
+ * function may race with binding and unbinding the device from a driver,
+ * we need to be careful. Binding is generally safe, at worst we miss the
+ * fact that the device is already bound to a driver (but the driver
+ * information that is delivered through uevents is best-effort, it may
+ * become obsolete as soon as it is generated anyways). Unbinding is more
+ * risky as driver pointer is transitioning to NULL, so READ_ONCE() should
+ * be used to make sure we are dealing with the same pointer, and to
+ * ensure that driver structure is not going to disappear from under us
+ * we take bus' drivers klist lock. The assumption that only registered
+ * driver can be bound to a device, and to unregister a driver bus code
+ * will take the same lock.
+ */
+static void dev_driver_uevent(const struct device *dev, struct kobj_uevent_env *env)
+{
+	struct subsys_private *sp = bus_to_subsys(dev->bus);
+
+	if (sp) {
+		scoped_guard(spinlock, &sp->klist_drivers.k_lock) {
+			struct device_driver *drv = READ_ONCE(dev->driver);
+			if (drv)
+				add_uevent_var(env, "DRIVER=%s", drv->name);
+		}
+
+		subsys_put(sp);
+	}
+}
+
 static int dev_uevent(const struct kobject *kobj, struct kobj_uevent_env *env)
 {
 	const struct device *dev = kobj_to_dev(kobj);
@@ -2655,8 +2684,8 @@ static int dev_uevent(const struct kobject *kobj, struct kobj_uevent_env *env)
 	if (dev->type && dev->type->name)
 		add_uevent_var(env, "DEVTYPE=%s", dev->type->name);
 
-	if (dev->driver)
-		add_uevent_var(env, "DRIVER=%s", dev->driver->name);
+	/* Add "DRIVER=%s" variable if the device is bound to a driver */
+	dev_driver_uevent(dev, env);
 
 	/* Add common DT information about the device */
 	of_device_uevent(dev, env);
-- 
2.39.5


  parent reply	other threads:[~2025-04-29 23:50 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-29 23:49 [PATCH AUTOSEL 6.14 01/39] cpufreq: Add SM8650 to cpufreq-dt-platdev blocklist Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 02/39] cpufreq: Do not enable by default during compile testing Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 03/39] nvmem: rockchip-otp: Move read-offset into variant-data Sasha Levin
2025-04-29 23:49   ` Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 04/39] nvmem: rockchip-otp: add rk3576 variant data Sasha Levin
2025-04-29 23:49   ` Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 05/39] nvmem: core: fix bit offsets of more than one byte Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 06/39] nvmem: core: verify cell's raw_len Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 07/39] nvmem: core: update raw_len if the bit reading is required Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 08/39] nvmem: qfprom: switch to 4-byte aligned reads Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 09/39] scsi: target: iscsi: Fix timeout on deleted connection Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 10/39] scsi: ufs: Introduce quirk to extend PA_HIBERN8TIME for UFS devices Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 11/39] virtio_ring: Fix data race by tagging event_triggered as racy for KCSAN Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 12/39] dma/mapping.c: dev_dbg support for dma_addressing_limited Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 13/39] intel_th: avoid using deprecated page->mapping, index fields Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 14/39] driver core: introduce device_set_driver() helper Sasha Levin
2025-04-29 23:49 ` Sasha Levin [this message]
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 16/39] mei: vsc: Use struct vsc_tp_packet as vsc-tp tx_buf and rx_buf type Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 17/39] dma-mapping: avoid potential unused data compilation warning Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 18/39] btrfs: tree-checker: adjust error code for header level check Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 19/39] cgroup: Fix compilation issue due to cgroup_mutex not being exported Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 20/39] vhost_task: fix vhost_task_create() documentation Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 21/39] vhost-scsi: protect vq->log_used with vq->mutex Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 22/39] scsi: mpi3mr: Add level check to control event logging Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 23/39] net: enetc: refactor bulk flipping of RX buffers to separate function Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 24/39] dma-mapping: Fix warning reported for missing prototype Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 25/39] ima: process_measurement() needlessly takes inode_lock() on MAY_READ Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 26/39] fs/buffer: split locking for pagecache lookups Sasha Levin
2025-04-30  0:47   ` Luis Chamberlain
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 27/39] fs/buffer: introduce sleeping flavors " Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 28/39] fs/buffer: use sleeping version of __find_get_block() Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 29/39] fs/ocfs2: " Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 30/39] fs/jbd2: " Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 31/39] fs/ext4: use sleeping version of sb_find_get_block() Sasha Levin
2025-04-29 23:49 ` [PATCH AUTOSEL 6.14 32/39] drm/amd/display: Enable urgent latency adjustment on DCN35 Sasha Levin
2025-04-29 23:50 ` [PATCH AUTOSEL 6.14 33/39] drm/amdgpu: Allow P2P access through XGMI Sasha Levin
2025-04-30 12:58   ` Alex Deucher
2025-04-29 23:50 ` [PATCH AUTOSEL 6.14 34/39] selftests/bpf: Mitigate sockmap_ktls disconnect_after_delete failure Sasha Levin
2025-04-29 23:50 ` [PATCH AUTOSEL 6.14 35/39] block: fix race between set_blocksize and read paths Sasha Levin
2025-04-29 23:50 ` [PATCH AUTOSEL 6.14 36/39] block: hoist block size validation code to a separate function Sasha Levin
2025-04-29 23:50 ` [PATCH AUTOSEL 6.14 37/39] io_uring: don't duplicate flushing in io_req_post_cqe Sasha Levin
2025-04-29 23:50 ` [PATCH AUTOSEL 6.14 38/39] bpf: fix possible endless loop in BPF map iteration Sasha Levin
2025-04-29 23:50 ` [PATCH AUTOSEL 6.14 39/39] samples/bpf: Fix compilation failure for samples/bpf on LoongArch Fedora Sasha Levin

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=20250429235006.536648-15-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=dakr@kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=rafael@kernel.org \
    --cc=stable@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.