Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bef3768d authored by Adam Kropelin's avatar Adam Kropelin Committed by Dmitry Torokhov
Browse files

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: default avatarAdam Kropelin <akropel1@rochester.rr.com>
Signed-off-by: default avatarVojtech Pavlik <vojtech@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 18098a6c

drivers/usb/input/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -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)