Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1312151 > unrolled thread

[PATCH] HID: core: prevent out-of-bound readings

Started byBenjamin Tissoires <benjamin.tissoires@redhat.com>
First post2016-01-19 12:40 +0100
Last post2016-01-19 14:20 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] HID: core: prevent out-of-bound readings Benjamin Tissoires <benjamin.tissoires@redhat.com> - 2016-01-19 12:40 +0100
    Re: [PATCH] HID: core: prevent out-of-bound readings Jiri Kosina <jikos@kernel.org> - 2016-01-19 14:20 +0100

#1312151 — [PATCH] HID: core: prevent out-of-bound readings

FromBenjamin Tissoires <benjamin.tissoires@redhat.com>
Date2016-01-19 12:40 +0100
Subject[PATCH] HID: core: prevent out-of-bound readings
Message-ID<qSCNJ-78i-39@gated-at.bofh.it>
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>
---
 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 1532ae6..4f329d4 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1294,6 +1294,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;
 	}
@@ -1306,11 +1307,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.0

[toc] | [next] | [standalone]


#1312211

FromJiri Kosina <jikos@kernel.org>
Date2016-01-19 14:20 +0100
Message-ID<qSEmw-8o1-33@gated-at.bofh.it>
In reply to#1312151
On Tue, 19 Jan 2016, Benjamin Tissoires wrote:

> 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>

Applied to for-4.5/upstream-fixes. Thanks,

-- 
Jiri Kosina
SUSE Labs

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web