diff options
| author | Ricky Liang <jcliang@chromium.org> | 2016-05-20 10:58:59 -0700 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-08-22 22:38:03 +0100 |
| commit | 285d720c9845f52168affde139246b204f07d4b8 (patch) | |
| tree | 000caa220b578912ab80a71d0f3e4f8f09f3bfee /drivers/input | |
| parent | 07cad668f0c30224f797b97028b623e37875611d (diff) | |
| download | linux-stable-285d720c9845f52168affde139246b204f07d4b8.tar.gz linux-stable-285d720c9845f52168affde139246b204f07d4b8.tar.bz2 linux-stable-285d720c9845f52168affde139246b204f07d4b8.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: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/input')
| -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 856936247500..5a63c274ae1c 100644 --- a/drivers/input/misc/uinput.c +++ b/drivers/input/misc/uinput.c @@ -886,9 +886,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 |