| From affa80bd97f7ca282d1faa91667b3ee9e4c590e6 Mon Sep 17 00:00:00 2001 |
| From: Ricky Liang <jcliang@chromium.org> |
| Date: Fri, 20 May 2016 10:58:59 -0700 |
| Subject: Input: uinput - handle compat ioctl for UI_SET_PHYS |
| |
| From: Ricky Liang <jcliang@chromium.org> |
| |
| commit affa80bd97f7ca282d1faa91667b3ee9e4c590e6 upstream. |
| |
| 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> |
| Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/input/misc/uinput.c | 6 ++++++ |
| 1 file changed, 6 insertions(+) |
| |
| --- a/drivers/input/misc/uinput.c |
| +++ b/drivers/input/misc/uinput.c |
| @@ -981,9 +981,15 @@ static long uinput_ioctl(struct file *fi |
| } |
| |
| #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 |