Skip to content

Commit 8101895

Browse files
AlanSterngregkh
authored andcommitted
HID: core: Harden s32ton() against conversion to 0 bits
[ Upstream 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> [ s32ton() was moved by c653ffc ("HID: stop exporting hid_snto32()"). Minor context change fixed. ] Signed-off-by: Wenshan Lan <jetlan9@163.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e7e8e9b commit 8101895

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

drivers/hid/hid-core.c

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

13521352
static u32 s32ton(__s32 value, unsigned n)
13531353
{
1354-
s32 a = value >> (n - 1);
1354+
s32 a;
1355+
1356+
if (!value || !n)
1357+
return 0;
1358+
1359+
a = value >> (n - 1);
13551360
if (a && a != -1)
13561361
return value < 0 ? 1 << (n - 1) : (1 << (n - 1)) - 1;
13571362
return value & ((1 << n) - 1);

0 commit comments

Comments
 (0)