]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up hid patch for 4.4
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Nov 2018 10:21:59 +0000 (11:21 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Nov 2018 10:21:59 +0000 (11:21 +0100)
queue-4.4/hid-uhid-forbid-uhid_create-under-kernel_ds-or-elevated-privileges.patch

index d0c253ab2427f18aae24ff5985d63c8094c06543..94a4153da3d7536cea6b14b028075650f6e62b84 100644 (file)
@@ -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 |   1++++++++++++
- 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: