diff options
author | Nicolas Saenz Julienne <nsaenzjulienne@suse.de> | 2019-03-27 11:18:48 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-31 06:46:28 -0700 |
commit | 69f67200cfd66cb6373a1db53a0ddd289cc1f6c2 (patch) | |
tree | 9b045a2b87f09d751c4a9b872161d291542f00d4 /include/linux | |
parent | 256f63c6806db42153f0b4a585c3431579c9bc74 (diff) | |
download | linux-stable-69f67200cfd66cb6373a1db53a0ddd289cc1f6c2.tar.gz linux-stable-69f67200cfd66cb6373a1db53a0ddd289cc1f6c2.tar.bz2 linux-stable-69f67200cfd66cb6373a1db53a0ddd289cc1f6c2.zip |
HID: core: move Usage Page concatenation to Main item
[ Upstream commit 58e75155009cc800005629955d3482f36a1e0eec ]
As seen on some USB wireless keyboards manufactured by Primax, the HID
parser was using some assumptions that are not always true. In this case
it's s the fact that, inside the scope of a main item, an Usage Page
will always precede an Usage.
The spec is not pretty clear as 6.2.2.7 states "Any usage that follows
is interpreted as a Usage ID and concatenated with the Usage Page".
While 6.2.2.8 states "When the parser encounters a main item it
concatenates the last declared Usage Page with a Usage to form a
complete usage value." Being somewhat contradictory it was decided to
match Window's implementation, which follows 6.2.2.8.
In summary, the patch moves the Usage Page concatenation from the local
item parsing function to the main item parsing function.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Reviewed-by: Terry Junge <terry.junge@poly.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/hid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index d44a78362942..8b3e5e8a72fb 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -414,6 +414,7 @@ struct hid_global { struct hid_local { unsigned usage[HID_MAX_USAGES]; /* usage array */ + u8 usage_size[HID_MAX_USAGES]; /* usage size array */ unsigned collection_index[HID_MAX_USAGES]; /* collection index array */ unsigned usage_index; unsigned usage_minimum; |