Skip to content

Commit 4993e1a

Browse files
baul1337gregkh
authored andcommitted
HID: core: fix OOB read of field->usage in hid_set_field()
commit a13cdb1 upstream. hid_set_field() hands field->usage + offset to hid_dump_input() before the guard that bounds offset: hid_dump_input(field->report->device, field->usage + offset, value); if (offset >= field->report_count) { hid_err(...); return -1; } Under CONFIG_DEBUG_FS hid_dump_input() dereferences that pointer, with buf = hid_resolv_usage(usage->hid, NULL). The usage[] array is allocated inline with the hid_field in hid_register_field() and holds field->maxusage entries, so an offset past it reads off the end of the kvzalloc()ed allocation and into a neighbouring object. Had the guard run first, offset < report_count <= maxusage would already have confined the pointer to the array. A caller supplies such an offset today. picolcd_fb_send_tile() validates only report->maxfield before issuing hid_set_field(report->field[0], 11 + i, ...) for i = 0..31, so its offsets are fixed at 11..42 and are never checked against the bound field. When the device registers that field with fewer usages, the framebuffer deferred-io work drives the read on every tile. KASAN reports a 4-byte slab-out-of-bounds read in hid_dump_input() below hid_set_field(), and the same boot logs "offset (1) exceeds report_count (1)" from the guard that runs only afterwards. Move the hid_dump_input() call below the guard. Because field->maxusage >= field->report_count, the guard then establishes that field->usage + offset lies inside the array before it is dereferenced, for every caller and without changing behaviour on the valid path. Discovered by XBOW, triaged by Baul Lee <baul.lee@xbow.com> Fixes: 1da177e ("Linux-2.6.12-rc2") Reported-by: Federico Kirschbaum <federico.kirschbaum@xbow.com> Reported-by: Baul Lee <baul.lee@xbow.com> Cc: stable@vger.kernel.org Signed-off-by: Baul Lee <baul.lee@xbow.com> Signed-off-by: Jiri Kosina <jkosina@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent abe00b7 commit 4993e1a

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

drivers/hid/hid-core.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1696,13 +1696,14 @@ int hid_set_field(struct hid_field *field, unsigned offset, __s32 value)
16961696

16971697
size = field->report_size;
16981698

1699-
hid_dump_input(field->report->device, field->usage + offset, value);
1700-
17011699
if (offset >= field->report_count) {
17021700
hid_err(field->report->device, "offset (%d) exceeds report_count (%d)\n",
17031701
offset, field->report_count);
17041702
return -1;
17051703
}
1704+
1705+
hid_dump_input(field->report->device, field->usage + offset, value);
1706+
17061707
if (field->logical_minimum < 0) {
17071708
if (value != snto32(s32ton(value, size), size)) {
17081709
hid_err(field->report->device, "value %d is out of range\n", value);

0 commit comments

Comments
 (0)