Skip to content

Commit 42a8c5e

Browse files
committed
HID: core: Harden s32ton() against conversion to 0 bits
jira VULN-136507 cve CVE-2025-39682 commit-author Alan Stern <stern@rowland.harvard.edu> commit a6b87bf Testing by the syzbot fuzzer showed that the HID core gets a shift-out-of-bounds exception when it tries to convert a 32-bit quantity to a 0-bit quantity. Ideally this should never occur, but there are buggy devices and some might have a report field with size set to zero; we shouldn't reject the report or the device just because of that. Instead, harden the s32ton() routine so that it returns a reasonable result instead of crashing when it is called with the number of bits set to 0 -- the same as what snto32() does. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Reported-by: syzbot+b63d677d63bcac06cf90@syzkaller.appspotmail.com Closes: https://lore.kernel.org/linux-usb/68753a08.050a0220.33d347.0008.GAE@google.com/ Tested-by: syzbot+b63d677d63bcac06cf90@syzkaller.appspotmail.com Fixes: dde5845 ("[PATCH] Generic HID layer - code split") Cc: stable@vger.kernel.org Link: https://patch.msgid.link/613a66cd-4309-4bce-a4f7-2905f9bce0c9@rowland.harvard.edu Signed-off-by: Benjamin Tissoires <bentiss@kernel.org> (cherry picked from commit a6b87bf) Signed-off-by: Brett Mastbergen <bmastbergen@ciq.com> # Conflicts: # drivers/hid/hid-core.c
1 parent 9f30757 commit 42a8c5e

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/hid/hid-core.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1338,7 +1338,12 @@ EXPORT_SYMBOL_GPL(hid_snto32);
13381338

13391339
static u32 s32ton(__s32 value, unsigned n)
13401340
{
1341-
s32 a = value >> (n - 1);
1341+
s32 a;
1342+
1343+
if (!value || !n)
1344+
return 0;
1345+
1346+
a = value >> (n - 1);
13421347
if (a && a != -1)
13431348
return value < 0 ? 1 << (n - 1) : (1 << (n - 1)) - 1;
13441349
return value & ((1 << n) - 1);

0 commit comments

Comments
 (0)