From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
To: Jiri Kosina <jikos@kernel.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Mario.Limonciello@dell.com,
Peter Hutterer <peter.hutterer@who-t.net>,
linux-input@vger.kernel.org, linux-kernel@vger.kernel.org,
Benjamin Tissoires <benjamin.tissoires@redhat.com>
Subject: [PATCH v2 09/13] HID: core: do not upper bound the collection stack
Date: Thu, 7 Jun 2018 09:54:44 +0200 [thread overview]
Message-ID: <20180607075448.5706-10-benjamin.tissoires@redhat.com> (raw)
In-Reply-To: <20180607075448.5706-1-benjamin.tissoires@redhat.com>
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
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---
no changes in v2
---
drivers/hid/hid-core.c | 17 ++++++++++++++---
include/linux/hid.h | 9 +++++----
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index a460ec147aee..7afed0c0f9e5 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -128,9 +128,19 @@ static int open_collection(struct hid_parser *parser, unsigned type)
usage = parser->local.usage[0];
- if (parser->collection_stack_ptr == HID_COLLECTION_STACK_SIZE) {
- hid_err(parser->device, "collection stack overflow\n");
- return -EINVAL;
+ if (parser->collection_stack_ptr == parser->collection_stack_size) {
+ unsigned int *collection_stack;
+ 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) {
@@ -837,6 +847,7 @@ static int hid_scan_report(struct hid_device *hid)
break;
}
+ kfree(parser->collection_stack);
vfree(parser);
return 0;
}
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 2e4498d52a2f..aee281522c6d 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -644,12 +644,13 @@ static inline void hid_set_drvdata(struct hid_device *hdev, void *data)
struct hid_parser {
struct hid_global global;
struct hid_global global_stack[HID_GLOBAL_STACK_SIZE];
- unsigned global_stack_ptr;
+ unsigned int global_stack_ptr;
struct hid_local local;
- unsigned collection_stack[HID_COLLECTION_STACK_SIZE];
- unsigned collection_stack_ptr;
+ unsigned int *collection_stack;
+ unsigned int collection_stack_ptr;
+ unsigned int collection_stack_size;
struct hid_device *device;
- unsigned scan_flags;
+ unsigned int scan_flags;
};
struct hid_class_descriptor {
--
2.14.3
next prev parent reply other threads:[~2018-06-07 7:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-07 7:54 [PATCH v2 00/13] Hid multitouch rewrite, support os system multi-axis devices, take 2 Benjamin Tissoires
2018-06-07 7:54 ` [PATCH v2 01/13] input: move MT_TOOL_* to input-event-codes.h Benjamin Tissoires
2018-06-11 17:16 ` Dmitry Torokhov
2018-06-07 7:54 ` [PATCH v2 02/13] input: add MT_TOOL_DIAL Benjamin Tissoires
2018-06-11 17:18 ` Dmitry Torokhov
2018-06-07 7:54 ` [PATCH v2 03/13] HID: multitouch: make sure the static list of class is not changed Benjamin Tissoires
2018-06-07 7:54 ` [PATCH v2 04/13] HID: multitouch: Store per collection multitouch data Benjamin Tissoires
2018-06-07 7:54 ` [PATCH v2 05/13] HID: multitouch: store a per application quirks value Benjamin Tissoires
2018-06-07 7:54 ` [PATCH v2 06/13] HID: multitouch: ditch mt_report_id Benjamin Tissoires
2018-06-07 7:54 ` [PATCH v2 07/13] HID: multitouch: remove one copy of values Benjamin Tissoires
2018-06-07 7:54 ` [PATCH v2 08/13] HID: input: enable Totem on the Dell Canvas 27 Benjamin Tissoires
2018-06-07 7:54 ` Benjamin Tissoires [this message]
2018-06-07 7:54 ` [PATCH v2 10/13] HID: microsoft: support the Surface Dial Benjamin Tissoires
2018-06-07 7:54 ` [PATCH v2 11/13] HID: multitouch: report MT_TOOL_PALM for non-confident touches Benjamin Tissoires
2018-06-07 7:54 ` [PATCH v2 12/13] HID: multitouch: touchscreens also use confidence reports Benjamin Tissoires
2018-06-07 7:54 ` [PATCH v2 13/13] HID: multitouch: handle palm for touchscreens Benjamin Tissoires
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180607075448.5706-10-benjamin.tissoires@redhat.com \
--to=benjamin.tissoires@redhat.com \
--cc=Mario.Limonciello@dell.com \
--cc=dmitry.torokhov@gmail.com \
--cc=jikos@kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peter.hutterer@who-t.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).