mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

HID: core: do not upper bound the collection stack

Browse source 
Looks like 4 was sufficient until now. However, the Surface Dial needs
a stack of 5 and simply fails at probing.
Dynamically add HID_COLLECTION_STACK_SIZE to the size of the stack if
we hit the upper bound.

Checkpatch complains about bare unsigned, so converting those to
'unsigned int' in struct hid_parser

Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Benjamin Tissoires 2018-07-13 16:13:50 +02:00 committed by Jiri Kosina
parent ba6b055e0f
commit 08a8a7cf14
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/hid/hid-core.c
View file

@ -128,9 +128,19 @@ static int open_collection(struct hid_parser *parser, unsigned type)
usage = parser->local.usage[0]; usage = parser->local.usage[0];
if (parser->collection_stack_ptr == HID_COLLECTION_STACK_SIZE) { if (parser->collection_stack_ptr == parser->collection_stack_size) {
hid_err(parser->device, "collection stack overflow\n"); unsigned int *collection_stack;
return -EINVAL; unsigned int new_size = parser->collection_stack_size +
HID_COLLECTION_STACK_SIZE;
collection_stack = krealloc(parser->collection_stack,
new_size * sizeof(unsigned int),
GFP_KERNEL);
if (!collection_stack)
return -ENOMEM;
parser->collection_stack = collection_stack;
parser->collection_stack_size = new_size;
} }
if (parser->device->maxcollection == parser->device->collection_size) { if (parser->device->maxcollection == parser->device->collection_size) {
@ -840,6 +850,7 @@ static int hid_scan_report(struct hid_device *hid)
break; break;
} }
kfree(parser->collection_stack);
vfree(parser); vfree(parser);
return 0; return 0;
} }

9
include/linux/hid.h
View file

@ -644,12 +644,13 @@ static inline void hid_set_drvdata(struct hid_device *hdev, void *data)
struct hid_parser { struct hid_parser {
struct hid_global global; struct hid_global global;
struct hid_global global_stack[HID_GLOBAL_STACK_SIZE]; struct hid_global global_stack[HID_GLOBAL_STACK_SIZE];
unsigned global_stack_ptr; unsigned int global_stack_ptr;
struct hid_local local; struct hid_local local;
unsigned collection_stack[HID_COLLECTION_STACK_SIZE]; unsigned int *collection_stack;
unsigned collection_stack_ptr; unsigned int collection_stack_ptr;
unsigned int collection_stack_size;
struct hid_device *device; struct hid_device *device;
unsigned scan_flags; unsigned int scan_flags;
}; };
struct hid_class_descriptor { struct hid_class_descriptor {