Skip to content

Commit

Permalink
Input: HID items of width 32 (bits) or greater are incorrectly extracted
Browse files Browse the repository at this point in the history
       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>
  • Loading branch information
Adam Kropelin authored and Dmitry Torokhov committed May 29, 2005
1 parent 18098a6 commit bef3768
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/usb/input/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit bef3768

Please sign in to comment.