Skip to content

Commit a262370

Browse files
Benjamin Tissoiresgregkh
authored andcommitted
HID: core: ensure the allocated report buffer can contain the reserved report ID
commit 4f15ee9 upstream. When the report ID is not used, the low level transport drivers expect the first byte to be 0. However, currently the allocated buffer not account for that extra byte, meaning that instead of having 8 guaranteed bytes for implement to be working, we only have 7. Reported-by: Alan Stern <stern@rowland.harvard.edu> Closes: https://lore.kernel.org/linux-input/c75433e0-9b47-4072-bbe8-b1d14ea97b13@rowland.harvard.edu/ Cc: stable@vger.kernel.org Suggested-by: Alan Stern <stern@rowland.harvard.edu> Link: https://patch.msgid.link/20250710-report-size-null-v2-1-ccf922b7c4e5@kernel.org Signed-off-by: Benjamin Tissoires <bentiss@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 68860d1 commit a262370

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/hid/hid-core.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1873,9 +1873,12 @@ u8 *hid_alloc_report_buf(struct hid_report *report, gfp_t flags)
18731873
/*
18741874
* 7 extra bytes are necessary to achieve proper functionality
18751875
* of implement() working on 8 byte chunks
1876+
* 1 extra byte for the report ID if it is null (not used) so
1877+
* we can reserve that extra byte in the first position of the buffer
1878+
* when sending it to .raw_request()
18761879
*/
18771880

1878-
u32 len = hid_report_len(report) + 7;
1881+
u32 len = hid_report_len(report) + 7 + (report->id == 0);
18791882

18801883
return kzalloc(len, flags);
18811884
}

0 commit comments

Comments
 (0)