Skip to content

Commit dc23806

Browse files
2045geminiDanilo Krummrich
authored andcommitted
driver core: enforce device_lock for driver_match_device()
Currently, driver_match_device() is called from three sites. One site (__device_attach_driver) holds device_lock(dev), but the other two (bind_store and __driver_attach) do not. This inconsistency means that bus match() callbacks are not guaranteed to be called with the lock held. Fix this by introducing driver_match_device_locked(), which guarantees holding the device lock using a scoped guard. Replace the unlocked calls in bind_store() and __driver_attach() with this new helper. Also add a lock assertion to driver_match_device() to enforce this guarantee. This consistency also fixes a known race condition. The driver_override implementation relies on the device_lock, so the missing lock led to the use-after-free (UAF) reported in Bugzilla for buses using this field. Stress testing the two newly locked paths for 24 hours with CONFIG_PROVE_LOCKING and CONFIG_LOCKDEP enabled showed no UAF recurrence and no lockdep warnings. Cc: stable@vger.kernel.org Closes: https://bugzilla.kernel.org/show_bug.cgi?id=220789 Suggested-by: Qiu-ji Chen <chenqiuji666@gmail.com> Signed-off-by: Gui-Dong Han <hanguidong02@gmail.com> Fixes: 49b420a ("driver core: check bus->match without holding device lock") Reviewed-by: Danilo Krummrich <dakr@kernel.org> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Rafael J. Wysocki (Intel) <rafael@kernel.org> Link: https://patch.msgid.link/20260113162843.12712-1-hanguidong02@gmail.com Signed-off-by: Danilo Krummrich <dakr@kernel.org>
1 parent a995fe1 commit dc23806

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

drivers/base/base.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,18 @@ void device_set_deferred_probe_reason(const struct device *dev, struct va_format
182182
static inline int driver_match_device(const struct device_driver *drv,
183183
struct device *dev)
184184
{
185+
device_lock_assert(dev);
186+
185187
return drv->bus->match ? drv->bus->match(dev, drv) : 1;
186188
}
187189

190+
static inline int driver_match_device_locked(const struct device_driver *drv,
191+
struct device *dev)
192+
{
193+
guard(device)(dev);
194+
return driver_match_device(drv, dev);
195+
}
196+
188197
static inline void dev_sync_state(struct device *dev)
189198
{
190199
if (dev->bus->sync_state)

drivers/base/bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ static ssize_t bind_store(struct device_driver *drv, const char *buf,
263263
int err = -ENODEV;
264264

265265
dev = bus_find_device_by_name(bus, NULL, buf);
266-
if (dev && driver_match_device(drv, dev)) {
266+
if (dev && driver_match_device_locked(drv, dev)) {
267267
err = device_driver_attach(drv, dev);
268268
if (!err) {
269269
/* success */

drivers/base/dd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,7 @@ static int __driver_attach(struct device *dev, void *data)
11801180
* is an error.
11811181
*/
11821182

1183-
ret = driver_match_device(drv, dev);
1183+
ret = driver_match_device_locked(drv, dev);
11841184
if (ret == 0) {
11851185
/* no match */
11861186
return 0;

0 commit comments

Comments
 (0)