HID: CVE-2018-9516

HID: debug: check length before copy_to_user()

References:
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-4.9.y&id=4a30c12542290f1def08b9ef0d677c024c500589

Change-Id: Id70114f96d06b7d085e4fa3f5f8b09a84ae24528
Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>

2 files changed, 57 insertions, 0 deletions

diff --git a/patches/cve/4.9.x.scc b/patches/cve/4.9.x.scc
index bd68a48..0121888 100644
--- a/patches/cve/4.9.x.scc
+++ b/patches/cve/4.9.x.scc
@@ -33,4 +33,5 @@ patch CVE-2018-10878-ext4-always-check-block-group-bounds-in-ext4_init_bl.patch
 patch CVE-2018-10879-ext4-make-sure-bitmaps-and-the-inode-table-don-t-ove.patch
 patch CVE-2018-10881-ext4-clear-i_data-in-ext4_inode_info-when-removing-i.patch
 patch CVE-2018-10882-ext4-add-more-inode-number-paranoia-checks.patch
+patch CVE-2018-9516-HID-debug-check-length-before-copy_to_user.patch
 
diff --git a/patches/cve/CVE-2018-9516-HID-debug-check-length-before-copy_to_user.patch b/patches/cve/CVE-2018-9516-HID-debug-check-length-before-copy_to_user.patch
new file mode 100644
index 0000000..e99f097
--- /dev/null
+++ b/patches/cve/CVE-2018-9516-HID-debug-check-length-before-copy_to_user.patch
@@ -0,0 +1,56 @@
+From 717adfdaf14704fd3ec7fa2c04520c0723247eac Mon Sep 17 00:00:00 2001
+From: Daniel Rosenberg <drosen@google.com>
+Date: Mon, 2 Jul 2018 16:59:37 -0700
+Subject: [PATCH] HID: debug: check length before copy_to_user()
+
+If our length is greater than the size of the buffer, we
+overflow the buffer
+
+CVE: CVE-2018-11237   
+Upstream-Status: Backport  
+
+Cc: stable@vger.kernel.org
+Signed-off-by: Daniel Rosenberg <drosen@google.com>
+Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
+Signed-off-by: Jiri Kosina <jkosina@suse.cz>
+Signed-off-by: Andreas Wellving <andreas.wellving@enea.com>
+---
+ drivers/hid/hid-debug.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c
+index 4f4e7a0..4db8e14 100644
+--- a/drivers/hid/hid-debug.c
++++ b/drivers/hid/hid-debug.c
+@@ -1154,6 +1154,8 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer,
+                        goto out;
+                if (list->tail > list->head) {
+                        len = list->tail - list->head;
++                       if (len > count)
++                               len = count;
+ 
+                        if (copy_to_user(buffer + ret, &list->hid_debug_buf[list->head], len)) {
+                                ret = -EFAULT;
+@@ -1163,6 +1165,8 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer,
+                        list->head += len;
+                } else {
+                        len = HID_DEBUG_BUFSIZE - list->head;
++                       if (len > count)
++                               len = count;
+ 
+                        if (copy_to_user(buffer, &list->hid_debug_buf[list->head], len)) {
+                                ret = -EFAULT;
+@@ -1170,7 +1174,9 @@ static ssize_t hid_debug_events_read(struct file *file, char __user *buffer,
+                        }
+                        list->head = 0;
+                        ret += len;
+-                       goto copy_rest;
++                       count -= len;
++                       if (count > 0)
++                               goto copy_rest;
+                }
+ 
+        }
+-- 
+
+