* [PATCH v3 1/2] HID: usbhid: adjust output pipe FIFO size
@ 2026-11-19 10:55 Dmitry Antipov
2026-11-19 10:55 ` [PATCH v3 2/2] HID: usbhid: free unsent raw output reports in usbhid_stop() Dmitry Antipov
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Antipov @ 2026-11-19 10:55 UTC (permalink / raw)
To: Benjamin Tissoires, Jiri Kosina
Cc: linux-input, lvc-project, Dmitry Antipov, Sashiko
For an USB-specific HID device, size of output FIFO should
be HID_OUTPUT_FIFO_SIZE rather than HID_CONTROL_FIFO_SIZE.
Reported-by: Sashiko <sashiko-bot@kernel.org>
Closes: https://syzkaller.appspot.com/bug?extid=e2c057ea576d2644e2be
Fixes: 4916b3a57fc9 ("[PATCH] Generic HID layer - USB API")
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
v3: unchanged since v2
v2: initial version to join the series
---
drivers/hid/usbhid/usbhid.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
index 75fe85d3d27a..c408e694a7b2 100644
--- a/drivers/hid/usbhid/usbhid.h
+++ b/drivers/hid/usbhid/usbhid.h
@@ -74,7 +74,7 @@ struct usbhid_device {
unsigned long last_ctrl; /* record of last output for timeouts */
struct urb *urbout; /* Output URB */
- struct hid_output_fifo out[HID_CONTROL_FIFO_SIZE]; /* Output pipe fifo */
+ struct hid_output_fifo out[HID_OUTPUT_FIFO_SIZE]; /* Output pipe fifo */
unsigned char outhead, outtail; /* Output pipe fifo head & tail */
char *outbuf; /* Output buffer */
dma_addr_t outbuf_dma; /* Output buffer dma */
--
2.56.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v3 2/2] HID: usbhid: free unsent raw output reports in usbhid_stop()
2026-11-19 10:55 [PATCH v3 1/2] HID: usbhid: adjust output pipe FIFO size Dmitry Antipov
@ 2026-11-19 10:55 ` Dmitry Antipov
2026-11-19 11:07 ` sashiko-bot
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Antipov @ 2026-11-19 10:55 UTC (permalink / raw)
To: Benjamin Tissoires, Jiri Kosina
Cc: linux-input, lvc-project, Dmitry Antipov,
syzbot+e2c057ea576d2644e2be
When HID device is stalled or disconnected, there might be an
unsent (i.e. never passed via hid_submit_out()) output reports.
So free their raw buffers in usbhid_stop() to avoid memory leaks.
Adjust hid_irq_out() to prevent hid_submit_out() from using an
uninitialized output pipe slot as well.
This is a companion of commit f7744fa16b96 ("HID: usbhid: free
raw_report buffers in usbhid_stop") and inspired by that one.
Reported-by: syzbot+e2c057ea576d2644e2be@syzkaller.appspotmail.com
Closes: https://syzkaller.appspot.com/bug?extid=e2c057ea576d2644e2be
Fixes: c500c9714011 ("HID: hid, make parsing event driven")
Assisted-by: Sashiko-0.2.5:gemini-3.1-pro-preview
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
---
v3: tweak hid_irq_out() to follow logic in hid_ctrl() (Sashiko)
v2: adjust loop to match actual FIFO size and tweak commit message
---
drivers/hid/usbhid/hid-core.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index d7cf2b56e117..bb3cb80d908b 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -452,7 +452,7 @@ static void hid_irq_out(struct urb *urb)
if (unplug) {
usbhid->outtail = usbhid->outhead;
- } else {
+ } else if (usbhid->outhead != usbhid->outtail) {
usbhid->outtail = (usbhid->outtail + 1) & (HID_OUTPUT_FIFO_SIZE - 1);
if (usbhid->outhead != usbhid->outtail &&
@@ -1260,6 +1260,14 @@ static void usbhid_stop(struct hid_device *hid)
usbhid->ctrltail = (usbhid->ctrltail + 1) &
(HID_CONTROL_FIFO_SIZE - 1);
}
+
+ while (usbhid->outtail != usbhid->outhead) {
+ kfree(usbhid->out[usbhid->outtail].raw_report);
+ usbhid->out[usbhid->outtail].raw_report = NULL;
+
+ usbhid->outtail = (usbhid->outtail + 1) &
+ (HID_OUTPUT_FIFO_SIZE - 1);
+ }
spin_unlock_irq(&usbhid->lock);
usb_kill_urb(usbhid->urbin);
--
2.56.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3 2/2] HID: usbhid: free unsent raw output reports in usbhid_stop()
2026-11-19 10:55 ` [PATCH v3 2/2] HID: usbhid: free unsent raw output reports in usbhid_stop() Dmitry Antipov
@ 2026-11-19 11:07 ` sashiko-bot
0 siblings, 0 replies; 3+ messages in thread
From: sashiko-bot @ 2026-11-19 11:07 UTC (permalink / raw)
To: Dmitry Antipov; +Cc: linux-input, dmitry.torokhov
Thank you for your contribution! Sashiko AI review found 1 potential
issue to consider:
- [Low] HID: usbhid: Fixes trailer cites c500c9714011 instead of
f129ea6d1efe
--
commit 589b15fa1479bdb0a0e176cff9a3a3493562ddb5
Author: Dmitry Antipov <dmantipov@yandex.ru>
> HID: usbhid: free unsent raw output reports in usbhid_stop()
>
> When HID device is stalled or disconnected, there might be an
> unsent (i.e. never passed via hid_submit_out()) output reports.
> So free their raw buffers in usbhid_stop() to avoid memory leaks.
> Adjust hid_irq_out() to prevent hid_submit_out() from using an
> uninitialized output pipe slot as well.
>
> This is a companion of commit f7744fa16b96 ("HID: usbhid: free
> raw_report buffers in usbhid_stop") and inspired by that one.
>
> Reported-by: syzbot+e2c057ea576d2644e2be@syzkaller.appspotmail.com
> Closes: https://syzkaller.appspot.com/bug?extid=e2c057ea576d2644e2be
> Fixes: c500c9714011 ("HID: hid, make parsing event driven")
> Assisted-by: Sashiko-0.2.5:gemini-3.1-pro-preview
> Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
[Severity: Low]
At c500c9714011 ("HID: hid, make parsing event driven"), struct
usbhid_device stored struct hid_report pointers in out[] rather than
dynamically allocated raw_report buffers. The per-entry raw_report
allocation in usbhid->out[] was introduced by f129ea6d1efe ("HID: fix a
lockup regression when using force feedback on a PID device"), so should
the Fixes tag be:
Fixes: f129ea6d1efe ("HID: fix a lockup regression when using force feedback on a PID device")
--
Sashiko AI review · https://sashiko.dev/#/patchset/20261119105551.488524-1-dmantipov@yandex.ru?part=2
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-19 11:07 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19 10:55 [PATCH v3 1/2] HID: usbhid: adjust output pipe FIFO size Dmitry Antipov
2026-11-19 10:55 ` [PATCH v3 2/2] HID: usbhid: free unsent raw output reports in usbhid_stop() Dmitry Antipov
2026-11-19 11:07 ` sashiko-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox