5.3-stable patches

added patches:
	hid-core-check-whether-usage-page-item-is-after-usage-id-items.patch

diff --git a/queue-5.3/hid-core-check-whether-usage-page-item-is-after-usage-id-items.patch b/queue-5.3/hid-core-check-whether-usage-page-item-is-after-usage-id-items.patch
new file mode 100644 (file)
index 0000000..dfa86cb
--- /dev/null
+++ b/queue-5.3/hid-core-check-whether-usage-page-item-is-after-usage-id-items.patch
@@ -0,0 +1,173 @@
+From 1cb0d2aee26335d0bccf29100c7bed00ebece851 Mon Sep 17 00:00:00 2001
+From: Candle Sun <candle.sun@unisoc.com>
+Date: Tue, 22 Oct 2019 22:21:39 +0800
+Subject: HID: core: check whether Usage Page item is after Usage ID items
+
+From: Candle Sun <candle.sun@unisoc.com>
+
+commit 1cb0d2aee26335d0bccf29100c7bed00ebece851 upstream.
+
+Upstream commit 58e75155009c ("HID: core: move Usage Page concatenation
+to Main item") adds support for Usage Page item after Usage ID items
+(such as keyboards manufactured by Primax).
+
+Usage Page concatenation in Main item works well for following report
+descriptor patterns:
+
+    USAGE_PAGE (Keyboard)                   05 07
+    USAGE_MINIMUM (Keyboard LeftControl)    19 E0
+    USAGE_MAXIMUM (Keyboard Right GUI)      29 E7
+    LOGICAL_MINIMUM (0)                     15 00
+    LOGICAL_MAXIMUM (1)                     25 01
+    REPORT_SIZE (1)                         75 01
+    REPORT_COUNT (8)                        95 08
+    INPUT (Data,Var,Abs)                    81 02
+
+-------------
+
+    USAGE_MINIMUM (Keyboard LeftControl)    19 E0
+    USAGE_MAXIMUM (Keyboard Right GUI)      29 E7
+    LOGICAL_MINIMUM (0)                     15 00
+    LOGICAL_MAXIMUM (1)                     25 01
+    REPORT_SIZE (1)                         75 01
+    REPORT_COUNT (8)                        95 08
+    USAGE_PAGE (Keyboard)                   05 07
+    INPUT (Data,Var,Abs)                    81 02
+
+But it makes the parser act wrong for the following report
+descriptor pattern(such as some Gamepads):
+
+    USAGE_PAGE (Button)                     05 09
+    USAGE (Button 1)                        09 01
+    USAGE (Button 2)                        09 02
+    USAGE (Button 4)                        09 04
+    USAGE (Button 5)                        09 05
+    USAGE (Button 7)                        09 07
+    USAGE (Button 8)                        09 08
+    USAGE (Button 14)                       09 0E
+    USAGE (Button 15)                       09 0F
+    USAGE (Button 13)                       09 0D
+    USAGE_PAGE (Consumer Devices)           05 0C
+    USAGE (Back)                            0a 24 02
+    USAGE (HomePage)                        0a 23 02
+    LOGICAL_MINIMUM (0)                     15 00
+    LOGICAL_MAXIMUM (1)                     25 01
+    REPORT_SIZE (1)                         75 01
+    REPORT_COUNT (11)                       95 0B
+    INPUT (Data,Var,Abs)                    81 02
+
+With Usage Page concatenation in Main item, parser recognizes all the
+11 Usages as consumer keys, it is not the HID device's real intention.
+
+This patch checks whether Usage Page is really defined after Usage ID
+items by comparing usage page using status.
+
+Usage Page concatenation on currently defined Usage Page will always
+do in local parsing when Usage ID items encountered.
+
+When Main item is parsing, concatenation will do again with last
+defined Usage Page if this page has not been used in the previous
+usages concatenation.
+
+Signed-off-by: Candle Sun <candle.sun@unisoc.com>
+Signed-off-by: Nianfu Bai <nianfu.bai@unisoc.com>
+Cc: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Cc: Siarhei Vishniakou <svv@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/hid/hid-core.c |   51 +++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 45 insertions(+), 6 deletions(-)
+
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -212,6 +212,18 @@ static unsigned hid_lookup_collection(st
+ }
+ 
+ /*
++ * Concatenate usage which defines 16 bits or less with the
++ * currently defined usage page to form a 32 bit usage
++ */
++
++static void complete_usage(struct hid_parser *parser, unsigned int index)
++{
++      parser->local.usage[index] &= 0xFFFF;
++      parser->local.usage[index] |=
++              (parser->global.usage_page & 0xFFFF) << 16;
++}
++
++/*
+  * Add a usage to the temporary parser table.
+  */
+ 
+@@ -222,6 +234,14 @@ static int hid_add_usage(struct hid_pars
+               return -1;
+       }
+       parser->local.usage[parser->local.usage_index] = usage;
++
++      /*
++       * If Usage item only includes usage id, concatenate it with
++       * currently defined usage page
++       */
++      if (size <= 2)
++              complete_usage(parser, parser->local.usage_index);
++
+       parser->local.usage_size[parser->local.usage_index] = size;
+       parser->local.collection_index[parser->local.usage_index] =
+               parser->collection_stack_ptr ?
+@@ -543,13 +563,32 @@ static int hid_parser_local(struct hid_p
+  * usage value."
+  */
+ 
+-static void hid_concatenate_usage_page(struct hid_parser *parser)
++static void hid_concatenate_last_usage_page(struct hid_parser *parser)
+ {
+       int i;
++      unsigned int usage_page;
++      unsigned int current_page;
++
++      if (!parser->local.usage_index)
++              return;
+ 
+-      for (i = 0; i < parser->local.usage_index; i++)
+-              if (parser->local.usage_size[i] <= 2)
+-                      parser->local.usage[i] += parser->global.usage_page << 16;
++      usage_page = parser->global.usage_page;
++
++      /*
++       * Concatenate usage page again only if last declared Usage Page
++       * has not been already used in previous usages concatenation
++       */
++      for (i = parser->local.usage_index - 1; i >= 0; i--) {
++              if (parser->local.usage_size[i] > 2)
++                      /* Ignore extended usages */
++                      continue;
++
++              current_page = parser->local.usage[i] >> 16;
++              if (current_page == usage_page)
++                      break;
++
++              complete_usage(parser, i);
++      }
+ }
+ 
+ /*
+@@ -561,7 +600,7 @@ static int hid_parser_main(struct hid_pa
+       __u32 data;
+       int ret;
+ 
+-      hid_concatenate_usage_page(parser);
++      hid_concatenate_last_usage_page(parser);
+ 
+       data = item_udata(item);
+ 
+@@ -772,7 +811,7 @@ static int hid_scan_main(struct hid_pars
+       __u32 data;
+       int i;
+ 
+-      hid_concatenate_usage_page(parser);
++      hid_concatenate_last_usage_page(parser);
+ 
+       data = item_udata(item);
+ 

diff --git a/queue-5.3/series b/queue-5.3/series
index a3a5f23cfe57b995d946099437f40494c3dc7f8a..60b82e0a6be50c6f055f24e5b250b7ec1b57f19d 100644 (file)
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -130,3 +130,4 @@ selftests-bpf-correct-perror-strings.patch
 tipc-fix-link-name-length-check.patch
 selftests-pmtu-use-oneline-for-ip-route-list-cache.patch
 ext4-add-more-paranoia-checking-in-ext4_expand_extra_isize-handling.patch
+hid-core-check-whether-usage-page-item-is-after-usage-id-items.patch