Skip to content

Commit c72f8e9

Browse files
djbwvegard
authored andcommitted
driver core: Fix uevent_show() vs driver detach race
commit 15fffc6a5624b13b428bb1c6e9088e32a55eb82c upstream. uevent_show() wants to de-reference dev->driver->name. There is no clean way for a device attribute to de-reference dev->driver unless that attribute is defined via (struct device_driver).dev_groups. Instead, the anti-pattern of taking the device_lock() in the attribute handler risks deadlocks with code paths that remove device attributes while holding the lock. This deadlock is typically invisible to lockdep given the device_lock() is marked lockdep_set_novalidate_class(), but some subsystems allocate a local lockdep key for @Dev->mutex to reveal reports of the form: ====================================================== WARNING: possible circular locking dependency detected 6.10.0-rc7+ #275 Tainted: G OE N ------------------------------------------------------ modprobe/2374 is trying to acquire lock: ffff8c2270070de0 (kn->active#6){++++}-{0:0}, at: __kernfs_remove+0xde/0x220 but task is already holding lock: ffff8c22016e88f8 (&cxl_root_key){+.+.}-{3:3}, at: device_release_driver_internal+0x39/0x210 which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (&cxl_root_key){+.+.}-{3:3}: __mutex_lock+0x99/0xc30 uevent_show+0xac/0x130 dev_attr_show+0x18/0x40 sysfs_kf_seq_show+0xac/0xf0 seq_read_iter+0x110/0x450 vfs_read+0x25b/0x340 ksys_read+0x67/0xf0 do_syscall_64+0x75/0x190 entry_SYSCALL_64_after_hwframe+0x76/0x7e -> #0 (kn->active#6){++++}-{0:0}: __lock_acquire+0x121a/0x1fa0 lock_acquire+0xd6/0x2e0 kernfs_drain+0x1e9/0x200 __kernfs_remove+0xde/0x220 kernfs_remove_by_name_ns+0x5e/0xa0 device_del+0x168/0x410 device_unregister+0x13/0x60 devres_release_all+0xb8/0x110 device_unbind_cleanup+0xe/0x70 device_release_driver_internal+0x1c7/0x210 driver_detach+0x47/0x90 bus_remove_driver+0x6c/0xf0 cxl_acpi_exit+0xc/0x11 [cxl_acpi] __do_sys_delete_module.isra.0+0x181/0x260 do_syscall_64+0x75/0x190 entry_SYSCALL_64_after_hwframe+0x76/0x7e The observation though is that driver objects are typically much longer lived than device objects. It is reasonable to perform lockless de-reference of a @driver pointer even if it is racing detach from a device. Given the infrequency of driver unregistration, use synchronize_rcu() in module_remove_driver() to close any potential races. It is potentially overkill to suffer synchronize_rcu() just to handle the rare module removal racing uevent_show() event. Thanks to Tetsuo Handa for the debug analysis of the syzbot report [1]. Fixes: c0a40097f0bc ("drivers: core: synchronize really_probe() and dev_uevent()") Reported-by: syzbot+4762dd74e32532cda5ff@syzkaller.appspotmail.com Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Closes: http://lore.kernel.org/5aa5558f-90a4-4864-b1b1-5d6784c5607d@I-love.SAKURA.ne.jp [1] Link: http://lore.kernel.org/669073b8ea479_5fffa294c1@dwillia2-xfh.jf.intel.com.notmuch Cc: stable@vger.kernel.org Cc: Ashish Sangwan <a.sangwan@samsung.com> Cc: Namjae Jeon <namjae.jeon@samsung.com> Cc: Dirk Behme <dirk.behme@de.bosch.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Rafael J. Wysocki <rafael@kernel.org> Signed-off-by: Dan Williams <dan.j.williams@intel.com> Link: https://lore.kernel.org/r/172081332794.577428.9738802016494057132.stgit@dwillia2-xfh.jf.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 49ea4e0d862632d51667da5e7a9c88a560e9c5a1) Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
1 parent 07f7f40 commit c72f8e9

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

drivers/base/core.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <linux/mutex.h>
2828
#include <linux/pm_runtime.h>
2929
#include <linux/netdevice.h>
30+
#include <linux/rcupdate.h>
3031
#include <linux/sched/signal.h>
3132
#include <linux/sysfs.h>
3233

@@ -900,6 +901,7 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj,
900901
struct kobj_uevent_env *env)
901902
{
902903
struct device *dev = kobj_to_dev(kobj);
904+
struct device_driver *driver;
903905
int retval = 0;
904906

905907
/* add device node properties if present */
@@ -928,8 +930,12 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj,
928930
if (dev->type && dev->type->name)
929931
add_uevent_var(env, "DEVTYPE=%s", dev->type->name);
930932

931-
if (dev->driver)
932-
add_uevent_var(env, "DRIVER=%s", dev->driver->name);
933+
/* Synchronize with module_remove_driver() */
934+
rcu_read_lock();
935+
driver = READ_ONCE(dev->driver);
936+
if (driver)
937+
add_uevent_var(env, "DRIVER=%s", driver->name);
938+
rcu_read_unlock();
933939

934940
/* Add common DT information about the device */
935941
of_device_uevent(dev, env);
@@ -999,11 +1005,8 @@ static ssize_t uevent_show(struct device *dev, struct device_attribute *attr,
9991005
if (!env)
10001006
return -ENOMEM;
10011007

1002-
/* Synchronize with really_probe() */
1003-
device_lock(dev);
10041008
/* let the kset specific function add its keys */
10051009
retval = kset->uevent_ops->uevent(kset, &dev->kobj, env);
1006-
device_unlock(dev);
10071010
if (retval)
10081011
goto out;
10091012

drivers/base/module.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/errno.h>
1010
#include <linux/slab.h>
1111
#include <linux/string.h>
12+
#include <linux/rcupdate.h>
1213
#include "base.h"
1314

1415
static char *make_driver_name(struct device_driver *drv)
@@ -79,6 +80,9 @@ void module_remove_driver(struct device_driver *drv)
7980
if (!drv)
8081
return;
8182

83+
/* Synchronize with dev_uevent() */
84+
synchronize_rcu();
85+
8286
sysfs_remove_link(&drv->p->kobj, "module");
8387

8488
if (drv->owner)

0 commit comments

Comments
 (0)