]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Input: uinput - handle compat ioctl for UI_SET_PHYS
authorRicky Liang <jcliang@chromium.org>
Fri, 20 May 2016 17:58:59 +0000 (10:58 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Fri, 20 May 2016 18:00:43 +0000 (11:00 -0700)
When running a 32-bit userspace on a 64-bit kernel, the UI_SET_PHYS
ioctl needs to be treated with special care, as it has the pointer
size encoded in the command.

Signed-off-by: Ricky Liang <jcliang@chromium.org>
Cc: stable@vger.kernel.org
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/misc/uinput.c

index 4eb9e4d94f46965e884f71326b96620982d9043a..79338f4bdecb68ec52b690ad7bc9db668e3f1868 100644 (file)
@@ -981,9 +981,15 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 }
 
 #ifdef CONFIG_COMPAT
+
+#define UI_SET_PHYS_COMPAT     _IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t)
+
 static long uinput_compat_ioctl(struct file *file,
                                unsigned int cmd, unsigned long arg)
 {
+       if (cmd == UI_SET_PHYS_COMPAT)
+               cmd = UI_SET_PHYS;
+
        return uinput_ioctl_handler(file, cmd, arg, compat_ptr(arg));
 }
 #endif