From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 26 Nov 2018 10:24:01 +0000 (+0100)
Subject: fix up 3.18 hid patch
X-Git-Tag: v3.18.127~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7531d5759eeae3c1d287debbb51ef48bf4f52ea3;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up 3.18 hid patch
---

diff --git a/queue-3.18/hid-uhid-forbid-uhid_create-under-kernel_ds-or-elevated-privileges.patch b/queue-3.18/hid-uhid-forbid-uhid_create-under-kernel_ds-or-elevated-privileges.patch
index d0c253ab242..94a4153da3d 100644
--- a/queue-3.18/hid-uhid-forbid-uhid_create-under-kernel_ds-or-elevated-privileges.patch
+++ b/queue-3.18/hid-uhid-forbid-uhid_create-under-kernel_ds-or-elevated-privileges.patch
@@ -33,8 +33,8 @@ Signed-off-by: Jiri Kosina <jkosina@suse.cz>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- drivers/hid/uhid.c |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
+ drivers/hid/uhid.c |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
 
 --- a/drivers/hid/uhid.c
 +++ b/drivers/hid/uhid.c
@@ -46,7 +46,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #include <linux/device.h>
  #include <linux/fs.h>
  #include <linux/hid.h>
-@@ -721,6 +722,17 @@ static ssize_t uhid_char_write(struct fi
+@@ -24,6 +25,7 @@
+ #include <linux/spinlock.h>
+ #include <linux/uhid.h>
+ #include <linux/wait.h>
++#include <linux/uaccess.h>
+ 
+ #define UHID_NAME	"uhid"
+ #define UHID_BUFSIZE	32
+@@ -721,6 +723,17 @@ static ssize_t uhid_char_write(struct fi
  
  	switch (uhid->input_buf.type) {
  	case UHID_CREATE: