* [PATCH v2] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove()
@ 2026-11-20 12:12 Ayaan Mirza Baig
2026-11-20 12:21 ` sashiko-bot
2026-11-20 21:03 ` Arnav Kapoor
0 siblings, 2 replies; 3+ messages in thread
From: Ayaan Mirza Baig @ 2026-11-20 12:12 UTC (permalink / raw)
To: Jiri Kosina, Benjamin Tissoires, Srinivas Pandruvada,
Jonathan Cameron
Cc: Arnav Kapoor, 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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove()
2026-11-20 12:12 [PATCH v2] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove() Ayaan Mirza Baig
@ 2026-11-20 12:21 ` sashiko-bot
2026-11-20 21:03 ` Arnav Kapoor
1 sibling, 0 replies; 3+ messages in thread
From: sashiko-bot @ 2026-11-20 12:21 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 5391cb83740840042fa3d18d4f3751bd37f573af
Author: Ayaan Mirza Baig <ayaanmirzabaig85@gmail.com>
HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove()
This commit moves spin_lock_irqsave(&data->lock, flags) from
sensor_hub_remove() into sensor_hub_finalize_pending_fn() to avoid holding
data->lock 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]
As reported by Arnav Kapoor on v1 [1], doesn't device_for_each_child() still
pass NULL instead of data to sensor_hub_finalize_pending_fn(), causing a NULL
pointer dereference at spin_lock_irqsave(&sd->lock, flags) whenever a sensor
hub with child devices is removed?
[1] https://lore.kernel.org/r/20261119201555.185270-1-kapoorarnav43@gmail.com
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261120121256.35339-1-ayaanmirzabaig85@gmail.com?part=1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v2] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove()
2026-11-20 12:12 [PATCH v2] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove() Ayaan Mirza Baig
2026-11-20 12:21 ` sashiko-bot
@ 2026-11-20 21:03 ` Arnav Kapoor
1 sibling, 0 replies; 3+ messages in thread
From: Arnav Kapoor @ 2026-11-20 21:03 UTC (permalink / raw)
To: Ayaan Mirza Baig
Cc: Jiri Kosina, Benjamin Tissoires, Srinivas Pandruvada,
Jonathan Cameron, Lee Jones, Heiko Stuebner, Zheng Shuhao,
linux-input, linux-iio, linux-kernel, syzbot+fb951970a334aaff00ba
On Fri, Nov 20, 2026 at 05:42:56PM +0530, Ayaan Mirza Baig wrote:
> 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.
...
> device_for_each_child(&hdev->dev, NULL,
> sensor_hub_finalize_pending_fn);
This line is still unchanged context in v2, so NULL is still passed and
the callback still does spin_lock_irqsave(&sd->lock, flags) on a NULL
sd. The diffstat (4 insertions, 3 deletions) matches that: the only
removed lines are the lock/unlock pair and the flags variable. Perhaps
the change didn't make it into the commit before git format-patch?
Separately, Zheng Shuhao posted a fix for the same syzbot report:
https://lore.kernel.org/all/20261120135005.566-1-viennaoffh@gmail.com/
It passes the hub data to the callback and also skips children without
platform_data (e.g. the HID battery power_supply child with
CONFIG_HID_BATTERY_STRENGTH=y), which would otherwise still be
dereferenced in sensor_hub_finalize_pending_fn(). It might be worth
agreeing between you which version goes forward.
Thanks,
Arnav
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-20 21:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-20 12:12 [PATCH v2] HID: hid-sensor-hub: avoid lock inversion in sensor_hub_remove() Ayaan Mirza Baig
2026-11-20 12:21 ` sashiko-bot
2026-11-20 21:03 ` Arnav Kapoor
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox