51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
|
From 50220dead1650609206efe91f0cc116132d59b3f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
||
|
|
Date: Tue, 19 Jan 2016 12:34:58 +0100
|
||
|
|
Subject: [PATCH] HID: core: prevent out-of-bound readings
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
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.
|
||
|
|
|
||
|
|
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
||
|
|
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
|
||
|
|
---
|
||
|
|
drivers/hid/hid-core.c | 3 +++
|
||
|
|
1 file changed, 3 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
|
||
|
|
index 16c2c66..3f6ac5f 100644
|
||
|
|
--- a/drivers/hid/hid-core.c
|
||
|
|
+++ b/drivers/hid/hid-core.c
|
||
|
|
@@ -1293,6 +1293,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;
|
||
|
|
}
|
||
|
|
@@ -1305,11 +1306,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);
|
||
|
|
--
|
||
|
|
2.5.5
|
||
|
|
|