Skip to content

Commit e5007b7

Browse files
committed
HID: core: detect and skip invalid inputs to snto32()
jira VULN-33524 cve-pre CVE-2022-48978 commit-author Randy Dunlap <[email protected]> commit a0312af Prevent invalid (0, 0) inputs to hid-core's snto32() function. Maybe it is just the dummy device here that is causing this, but there are hundreds of calls to snto32(0, 0). Having n (bits count) of 0 is causing the current UBSAN trap with a shift value of 0xffffffff (-1, or n - 1 in this function). Either of the value to shift being 0 or the bits count being 0 can be handled by just returning 0 to the caller, avoiding the following complex shift + OR operations: return value & (1 << (n - 1)) ? value | (~0U << n) : value; Fixes: dde5845 ("[PATCH] Generic HID layer - code split") Signed-off-by: Randy Dunlap <[email protected]> Reported-by: [email protected] Cc: Jiri Kosina <[email protected]> Cc: Benjamin Tissoires <[email protected]> Cc: [email protected] Signed-off-by: Jiri Kosina <[email protected]> (cherry picked from commit a0312af) Signed-off-by: Brett Mastbergen <[email protected]>
1 parent 699aea3 commit e5007b7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/hid/hid-core.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,6 +1026,9 @@ EXPORT_SYMBOL_GPL(hid_open_report);
10261026

10271027
static s32 snto32(__u32 value, unsigned n)
10281028
{
1029+
if (!value || !n)
1030+
return 0;
1031+
10291032
switch (n) {
10301033
case 8: return ((__s8)value);
10311034
case 16: return ((__s16)value);

0 commit comments

Comments
 (0)