* [PATCH] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove()
@ 2026-11-19 19:20 Ayaan Mirza Baig
2026-11-19 19:33 ` sashiko-bot
2026-11-19 20:15 ` Arnav Kapoor
0 siblings, 2 replies; 3+ messages in thread
From: Ayaan Mirza Baig @ 2026-11-19 19:20 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires, Srinivas Pandruvada,
Jonathan Cameron
Cc: Lee Jones, Heiko Stuebner, linux-input, linux-iio, linux-kernel,
Ayaan Mirza Baig, syzbot+fb951970a334aaff00ba
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@syzkaller.appspotmail.com
Closes: https://lore.kernel.org/all/6afddf21.a11fe2ad.1b4426.0003.GAE@google.com/T/
Fixes: 8a5b38c3fd70 ("HID: hid-sensor-hub: don't use stale platform-data on remove")
Signed-off-by: Ayaan Mirza Baig <ayaanmirzabaig85@gmail.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove()
2026-11-19 19:20 [PATCH] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove() Ayaan Mirza Baig
@ 2026-11-19 19:33 ` sashiko-bot
2026-11-19 20:15 ` Arnav Kapoor
1 sibling, 0 replies; 3+ messages in thread
From: sashiko-bot @ 2026-11-19 19:33 UTC (permalink / raw)
To: Ayaan Mirza Baig; +Cc: linux-input, dmitry.torokhov
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [High] HID: hid-sensor-hub: NULL dereference in
sensor_hub_finalize_pending_fn()
--
commit 1ba2998091dc7a9d09c7bc99c333bc23a67a24d5
Author: Ayaan Mirza Baig <ayaanmirzabaig85@gmail.com>
HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove()
This commit moves the acquisition of &data->lock from sensor_hub_remove()
into sensor_hub_finalize_pending_fn() to avoid holding the spinlock across
device_for_each_child().
> diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c
> index 028e70ec7bace..4ade5b5ece565 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);
[Severity: High]
Does sensor_hub_remove() need to pass data instead of NULL to
device_for_each_child()? Passing NULL causes a NULL pointer dereference
on &sd->lock in sensor_hub_finalize_pending_fn() when removing a sensor
hub with any child device.
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261119192046.1015750-1-ayaanmirzabaig85@gmail.com?part=1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove()
2026-11-19 19:20 [PATCH] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove() Ayaan Mirza Baig
2026-11-19 19:33 ` sashiko-bot
@ 2026-11-19 20:15 ` Arnav Kapoor
1 sibling, 0 replies; 3+ messages in thread
From: Arnav Kapoor @ 2026-11-19 20:15 UTC (permalink / raw)
To: Ayaan Mirza Baig
Cc: Jiri Kosina, Benjamin Tissoires, Srinivas Pandruvada,
Jonathan Cameron, Lee Jones, Heiko Stuebner, linux-input,
linux-iio, linux-kernel, syzbot+fb951970a334aaff00ba
On Fri, Nov 20, 2026 at 12:50:46AM +0530, Ayaan Mirza Baig wrote:
> 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.
...
> 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);
...
> device_for_each_child(&hdev->dev, NULL,
> sensor_hub_finalize_pending_fn);
The commit message says data is passed through device_for_each_child(),
but the call still passes NULL, so sd is NULL in the callback and
spin_lock_irqsave(&sd->lock, flags) dereferences it. That would oops on
every removal of a hub with child devices, instead of the lockdep
warning. Sashiko flags the same thing.
I think it should be:
device_for_each_child(&hdev->dev, data,
sensor_hub_finalize_pending_fn);
With that, moving the lock into the callback looks right to me: k_lock
is a plain spinlock, so it shouldn't nest inside data->lock, which
sensor_hub_raw_event() takes from interrupt context.
Could you send a v2 with that change, and say whether the syzbot
reproducer runs clean with it?
Thanks,
Arnav
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-19 20:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 19:20 [PATCH] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove() Ayaan Mirza Baig
2026-11-19 19:33 ` sashiko-bot
2026-11-19 20:15 ` Arnav Kapoor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).