Skip to content

Commit

Permalink
HID: i2c-hid: fix ret_count check
Browse files Browse the repository at this point in the history
ret_count has to be at least 3, as we have to count the 2 bytes that are used
for the size of the reply. Without this, memcpy() might be called with zero or
negative count.

Reported-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Jiri Kosina committed Dec 6, 2012
1 parent e5b50fe commit 9afd09a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/hid/i2c-hid/i2c-hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ static int i2c_hid_get_raw_report(struct hid_device *hid,

ret_count = ihid->inbuf[0] | (ihid->inbuf[1] << 8);

if (!ret_count)
if (ret_count <= 2)
return 0;

ret_count = min(ret_count, ask_count);
Expand Down

0 comments on commit 9afd09a

Please sign in to comment.