Skip to content

Commit 4a7c2a8

Browse files
djbwgregkh
authored andcommitted
driver core: Fix uevent_show() vs driver detach race
commit 15fffc6 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+ torvalds#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: c0a4009 ("drivers: core: synchronize really_probe() and dev_uevent()") Reported-by: [email protected] Reported-by: Tetsuo Handa <[email protected]> Closes: http://lore.kernel.org/[email protected] [1] Link: http://lore.kernel.org/[email protected] Cc: [email protected] Cc: Ashish Sangwan <[email protected]> Cc: Namjae Jeon <[email protected]> Cc: Dirk Behme <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Signed-off-by: Dan Williams <[email protected]> Link: https://lore.kernel.org/r/172081332794.577428.9738802016494057132.stgit@dwillia2-xfh.jf.intel.com Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 77c7277 commit 4a7c2a8

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
@@ -25,6 +25,7 @@
2525
#include <linux/mutex.h>
2626
#include <linux/pm_runtime.h>
2727
#include <linux/netdevice.h>
28+
#include <linux/rcupdate.h>
2829
#include <linux/sched/signal.h>
2930
#include <linux/sched/mm.h>
3031
#include <linux/swiotlb.h>
@@ -2558,6 +2559,7 @@ static const char *dev_uevent_name(struct kobject *kobj)
25582559
static int dev_uevent(struct kobject *kobj, struct kobj_uevent_env *env)
25592560
{
25602561
struct device *dev = kobj_to_dev(kobj);
2562+
struct device_driver *driver;
25612563
int retval = 0;
25622564

25632565
/* add device node properties if present */
@@ -2586,8 +2588,12 @@ static int dev_uevent(struct kobject *kobj, struct kobj_uevent_env *env)
25862588
if (dev->type && dev->type->name)
25872589
add_uevent_var(env, "DEVTYPE=%s", dev->type->name);
25882590

2589-
if (dev->driver)
2590-
add_uevent_var(env, "DRIVER=%s", dev->driver->name);
2591+
/* Synchronize with module_remove_driver() */
2592+
rcu_read_lock();
2593+
driver = READ_ONCE(dev->driver);
2594+
if (driver)
2595+
add_uevent_var(env, "DRIVER=%s", driver->name);
2596+
rcu_read_unlock();
25912597

25922598
/* Add common DT information about the device */
25932599
of_device_uevent(dev, env);
@@ -2657,11 +2663,8 @@ static ssize_t uevent_show(struct device *dev, struct device_attribute *attr,
26572663
if (!env)
26582664
return -ENOMEM;
26592665

2660-
/* Synchronize with really_probe() */
2661-
device_lock(dev);
26622666
/* let the kset specific function add its keys */
26632667
retval = kset->uevent_ops->uevent(&dev->kobj, env);
2664-
device_unlock(dev);
26652668
if (retval)
26662669
goto out;
26672670

drivers/base/module.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/errno.h>
88
#include <linux/slab.h>
99
#include <linux/string.h>
10+
#include <linux/rcupdate.h>
1011
#include "base.h"
1112

1213
static char *make_driver_name(struct device_driver *drv)
@@ -77,6 +78,9 @@ void module_remove_driver(struct device_driver *drv)
7778
if (!drv)
7879
return;
7980

81+
/* Synchronize with dev_uevent() */
82+
synchronize_rcu();
83+
8084
sysfs_remove_link(&drv->p->kobj, "module");
8185

8286
if (drv->owner)

0 commit comments

Comments
 (0)