diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2016-01-19 12:34:58 +0100 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-11-11 13:26:51 +1100 |
| commit | 92614279392e9115866e2ac4694120f1b732e05c (patch) | |
| tree | 829750d6ef59544a6fdd3ebdc794d84dc90f0088 | |
| parent | f4610dd025e74a9cd63a755e1c1ecf71e9cdec0a (diff) | |
| download | kernel_samsung_smdk4412-92614279392e9115866e2ac4694120f1b732e05c.tar.gz kernel_samsung_smdk4412-92614279392e9115866e2ac4694120f1b732e05c.tar.bz2 kernel_samsung_smdk4412-92614279392e9115866e2ac4694120f1b732e05c.zip | |
HID: core: prevent out-of-bound readings
Plugging a Logitech DJ receiver with KASAN activated raises a bunch of
out-of-bound readings.
The fields are allocated up to MAX_USAGE, meaning that potentially, we do
not have enough fields to fit the incoming values.
Add checks and silence KASAN.
Change-Id: I11d44957b450a3eda258c05f9e833c71a079e83c
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 8f8728b4b7f..9d09e9e68c7 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -977,6 +977,7 @@ static void hid_input_field(struct hid_device *hid, struct hid_field *field, /* Ignore report if ErrorRollOver */ if (!(field->flags & HID_MAIN_ITEM_VARIABLE) && value[n] >= min && value[n] <= max && + value[n] - min < field->maxusage && field->usage[value[n] - min].hid == HID_UP_KEYBOARD + 1) goto exit; } @@ -989,11 +990,13 @@ static void hid_input_field(struct hid_device *hid, struct hid_field *field, } if (field->value[n] >= min && field->value[n] <= max + && field->value[n] - min < field->maxusage && field->usage[field->value[n] - min].hid && search(value, field->value[n], count)) hid_process_event(hid, field, &field->usage[field->value[n] - min], 0, interrupt); if (value[n] >= min && value[n] <= max + && value[n] - min < field->maxusage && field->usage[value[n] - min].hid && search(field->value, value[n], count)) hid_process_event(hid, field, &field->usage[value[n] - min], 1, interrupt); |