linux-kernel - Re: [PATCH v2] Input: uinput - handle compat ioctl for UI_SET

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20160520175935.GF14951@dtor-ws>
Date:	Fri, 20 May 2016 10:59:35 -0700
From:	Dmitry Torokhov <dmitry.torokhov@...il.com>
To:	Ricky Liang <jcliang@...omium.org>
Cc:	David Herrmann <dh.herrmann@...il.com>,
	Benjamin Tissoires <benjamin.tissoires@...hat.com>,
	Anshul Garg <aksgarg1989@...il.com>,
	Elias Vanderstuyft <elias.vds@...il.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	"open list:INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN)..." 
	<linux-input@...r.kernel.org>,
	open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2] Input: uinput - handle compat ioctl for UI_SET_PHYS

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@...omium.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