Re: [PATCH] HID: sensor-hub: Avoid holding spinlock across child iteration

From: Srinivas Pandruvada

Date: Fri Nov 20 2026 - 07:14:23 EST


On Fri, 2026-11-20 at 15:56 +0800, Zheng Shuhao wrote:
> syzbot reports a SOFTIRQ-safe -> SOFTIRQ-unsafe lock order warning
> during
> sensor hub removal.
>
> sensor_hub_remove() currently holds sensor_data->lock while calling
> device_for_each_child(). The child iteration enters the device core
> and may
> acquire the klist lock. Since sensor_data->lock is also acquired with
> interrupts disabled by sensor_hub_raw_event(), lockdep reports a
> possible
> lock-order inversion.
>
> The callback only needs sensor_data->lock while checking
> pending.status and
> completing pending.ready. Pass sensor_data to the callback and take
> the lock
> only around that short critical section instead of holding it across
> device_for_each_child().
>
> This preserves synchronization of pending.status while avoiding the
> lock-order
> dependency between sensor_data->lock and the device core's klist
> lock.
>
> The syzbot report is available at:
> https://syzkaller.appspot.com/bug?id=c7c429f6851638ece81338f90c5b29ac9c0dea1f
>

Ayaan posted a similar patch yesterday.

Thanks,
Srinivas


> Testing:
> - Reproduced the target lockdep warning with the unmodified kernel in
> 3/3
>   two-CPU QEMU runs.
> - The warning was absent with this patch in 3/3 equivalent runs.
> - Ran the HID selftests against both baseline and patched kernels:
>   hid_bpf: 45 passed, 1 skipped, 0 failed
>   hidraw: 27 passed, 0 failed
>   hid-core, hid-apple, hid-gamepad, hid-ite, hid-keyboard, hid-mouse,
>   hid-multitouch, hid-sony, and hid-tablet all passed in both runs.
> - hid-usb_crash.sh and hid-wacom.sh produced TAP 1..0 / rc=2 in both
>   kernels because no executable test cases were collected in this
> minimal
>   QEMU environment.
> - No KASAN report, use-after-free, Oops, BUG, panic, or general
> protection
>   fault was observed.
> - checkpatch.pl --strict --no-signoff reports 0 errors and 0
> warnings.
>
> Reported-by:
> syzbot+c7c429f6851638ece81338f90c5b29ac9c0dea1f@xxxxxxxxxxxxxxxxxxxxxxxxx
> Closes:
> https://syzkaller.appspot.com/bug?id=c7c429f6851638ece81338f90c5b29ac9c0dea1f
> Signed-off-by: Zheng Shuhao <viennaoffh@xxxxxxxxx>
> Tested-by: Zheng Shuhao <viennaoffh@xxxxxxxxx>
> ---
>  drivers/hid/hid-sensor-hub.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-
> hub.c
> index 6470a290ebfc5..62799c26e6ec3 100644
> --- a/drivers/hid/hid-sensor-hub.c
> +++ b/drivers/hid/hid-sensor-hub.c
> @@ -804,9 +804,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 *sensor_data = data;
> + unsigned long flags;
>  
> + spin_lock_irqsave(&sensor_data->lock, flags);
>   if (hsdev->pending.status)
>   complete(&hsdev->pending.ready);
> + spin_unlock_irqrestore(&sensor_data->lock, flags);
>  
>   return 0;
>  }
> @@ -814,16 +818,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,
> + device_for_each_child(&hdev->dev, data,
>         sensor_hub_finalize_pending_fn);
> - spin_unlock_irqrestore(&data->lock, flags);
>  
>   mfd_remove_devices(&hdev->dev);
>   mutex_destroy(&data->mutex);