diff options
| author | Ricky Liang <jcliang@chromium.org> | 2016-05-20 10:58:59 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-07 17:21:57 -0700 |
| commit | 79925b261448de46f9b4a63fd7bc957953dda170 (patch) | |
| tree | 9995fb478ce19353a60e3657c9e56ddf7823f0f0 /drivers | |
| parent | ac5a8ffc308eabd67253a9ffa8ff174e628d34f8 (diff) | |
| download | lwn-79925b261448de46f9b4a63fd7bc957953dda170.tar.gz lwn-79925b261448de46f9b4a63fd7bc957953dda170.zip | |
Input: uinput - handle compat ioctl for UI_SET_PHYS
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/misc/uinput.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c index 772835938a52..46631c62e9a4 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -845,9 +845,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 |