Browse Source

Input: HID items of width 32 (bits) or greater are incorrectly extracted
due to a masking bug in hid-core.c:extract(). This patch fixes it
up by forcing the mask to be 64 bits wide.

Signed-off-by: Adam Kropelin <akropel1@rochester.rr.com>
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

Adam Kropelin 20 years ago
parent
commit
bef3768d8f
1 changed files with 1 additions and 1 deletions
  1. 1 1
      drivers/usb/input/hid-core.c

+ 1 - 1
drivers/usb/input/hid-core.c

@@ -765,7 +765,7 @@ static __inline__ __u32 s32ton(__s32 value, unsigned n)
 static __inline__ __u32 extract(__u8 *report, unsigned offset, unsigned n)
 {
 	report += (offset >> 5) << 2; offset &= 31;
-	return (le64_to_cpu(get_unaligned((__le64*)report)) >> offset) & ((1 << n) - 1);
+	return (le64_to_cpu(get_unaligned((__le64*)report)) >> offset) & ((1ULL << n) - 1);
 }
 
 static __inline__ void implement(__u8 *report, unsigned offset, unsigned n, __u32 value)