[PATCH v2] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove()
From: Ayaan Mirza Baig
Date: Fri Nov 20 2026 - 07:13:15 EST
In sensor_hub_remove(), spin_lock_irqsave(&data->lock, flags) is held
while calling device_for_each_child(), which iterates child devices via
klist_next() and acquires the driver core's &k->k_lock.
Because &data->lock is acquired in softirq context by
sensor_hub_raw_event() while &k->k_lock is acquired elsewhere with
softirqs enabled, nesting &k->k_lock under &data->lock triggers a
SOFTIRQ-safe -> SOFTIRQ-unsafe lockdep warning and risks an ABBA
deadlock between process context and softirq context.
Move spin_lock_irqsave()/spin_unlock_irqrestore() into
sensor_hub_finalize_pending_fn() and pass data through
device_for_each_child(), so &data->lock is only held while inspecting
and completing each child's pending state after klist_next() releases
&k->k_lock.
Reported-by: syzbot+fb951970a334aaff00ba@xxxxxxxxxxxxxxxxxxxxxxxxx
Closes: https://lore.kernel.org/all/6afddf21.a11fe2ad.1b4426.0003.GAE@xxxxxxxxxx/T/
Fixes: 8a5b38c3fd70 ("HID: hid-sensor-hub: don't use stale platform-data on remove")
Signed-off-by: Ayaan Mirza Baig <ayaanmirzabaig85@xxxxxxxxx>
---
Changes in v2:
- Pass 'data' instead of NUL to device_for_each_child() so
sensor_hub_finalize_pending_fn() does not dereference a NULL sd pointer.
Tested against the syzbot C reproducer on linux-next; it runs cleanly
with no lockdep warnings or oopses.
drivers/hid/hid-sensor-hub.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
index 028e70ec7bac..4ade5b5ece56 100644
--- a/drivers/hid/hid-sensor-hub.c
+++ b/drivers/hid/hid-sensor-hub.c
@@ -836,9 +836,13 @@ static int sensor_hub_probe(struct hid_device *hdev,
static int sensor_hub_finalize_pending_fn(struct device *dev, void *data)
{
struct hid_sensor_hub_device *hsdev = dev->platform_data;
+ struct sensor_hub_data *sd = data;
+ unsigned long flags;
+ spin_lock_irqsave(&sd->lock, flags);
if (hsdev->pending.status)
complete(&hsdev->pending.ready);
+ spin_unlock_irqrestore(&sd->lock, flags);
return 0;
}
@@ -846,16 +850,13 @@ static int sensor_hub_finalize_pending_fn(struct device *dev, void *data)
static void sensor_hub_remove(struct hid_device *hdev)
{
struct sensor_hub_data *data = hid_get_drvdata(hdev);
- unsigned long flags;
hid_dbg(hdev, " hardware removed\n");
hid_hw_close(hdev);
hid_hw_stop(hdev);
- spin_lock_irqsave(&data->lock, flags);
device_for_each_child(&hdev->dev, NULL,
sensor_hub_finalize_pending_fn);
- spin_unlock_irqrestore(&data->lock, flags);
mfd_remove_devices(&hdev->dev);
mutex_destroy(&data->mutex);
--
2.56.1