Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1404665

Re: [PATCH v2] Input: uinput - handle compat ioctl for UI_SET_PHYS

Show all headers | View raw

On Sat, May 21, 2016 at 01:50:46AM +0800, Ricky Liang wrote:
> 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>

Applied, thank you.

> ---
>  drivers/input/misc/uinput.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
> index abe1a92..65ebbd1 100644
> --- a/drivers/input/misc/uinput.c
> +++ b/drivers/input/misc/uinput.c
> @@ -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
> -- 
> 2.1.2
> 

-- 
Dmitry

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS Ricky Liang <jcliang@chromium.org> - 2016-05-17 17:50 +0200
  Re: [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-05-20 18:40 +0200
    Re: [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS Ricky Liang <jcliang@chromium.org> - 2016-05-20 20:00 +0200
  Re: [PATCH v2] Input: uinput - handle compat ioctl for UI_SET_PHYS Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-05-20 20:00 +0200
  [PATCH v2] Input: uinput - handle compat ioctl for UI_SET_PHYS Ricky Liang <jcliang@chromium.org> - 2016-05-20 20:00 +0200

csiph-web