* [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS
@ 2016-05-17 15:39 Ricky Liang
2016-05-20 16:32 ` Dmitry Torokhov
2016-05-20 17:50 ` [PATCH v2] " Ricky Liang
0 siblings, 2 replies; 5+ messages in thread
From: Ricky Liang @ 2016-05-17 15:39 UTC (permalink / raw)
Cc: Ricky Liang, Dmitry Torokhov, David Herrmann, Benjamin Tissoires,
Andrew Morton, Elias Vanderstuyft, Anshul Garg,
open list:INPUT KEYBOARD, MOUSE, JOYSTICK , TOUCHSCREEN...,
open list
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>
---
drivers/input/misc/uinput.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
index abe1a92..b4d1b1d 100644
--- a/drivers/input/misc/uinput.c
+++ b/drivers/input/misc/uinput.c
@@ -984,6 +984,15 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
static long uinput_compat_ioctl(struct file *file,
unsigned int cmd, unsigned long arg)
{
+ switch (_IOC_NR(cmd)) {
+ case _IOC_NR(UI_SET_PHYS):
+ if (_IOC_SIZE(cmd) == sizeof(compat_uptr_t)) {
+ cmd &= ~IOCSIZE_MASK;
+ cmd |= sizeof(void *) << IOCSIZE_SHIFT;
+ }
+ break;
+ }
+
return uinput_ioctl_handler(file, cmd, arg, compat_ptr(arg));
}
#endif
--
2.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS
2016-05-17 15:39 [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS Ricky Liang
@ 2016-05-20 16:32 ` Dmitry Torokhov
2016-05-20 17:50 ` Ricky Liang
2016-05-20 17:50 ` [PATCH v2] " Ricky Liang
1 sibling, 1 reply; 5+ messages in thread
From: Dmitry Torokhov @ 2016-05-20 16:32 UTC (permalink / raw)
To: Ricky Liang
Cc: David Herrmann, Benjamin Tissoires, Andrew Morton,
Elias Vanderstuyft, Anshul Garg,
open list:INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN)...,
open list
Hi Ricky,
On Tue, May 17, 2016 at 11:39:45PM +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>
> ---
> drivers/input/misc/uinput.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
> index abe1a92..b4d1b1d 100644
> --- a/drivers/input/misc/uinput.c
> +++ b/drivers/input/misc/uinput.c
> @@ -984,6 +984,15 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> static long uinput_compat_ioctl(struct file *file,
> unsigned int cmd, unsigned long arg)
> {
> + switch (_IOC_NR(cmd)) {
> + case _IOC_NR(UI_SET_PHYS):
> + if (_IOC_SIZE(cmd) == sizeof(compat_uptr_t)) {
> + cmd &= ~IOCSIZE_MASK;
> + cmd |= sizeof(void *) << IOCSIZE_SHIFT;
> + }
> + break;
> + }
> +
This looks quite complicated... Can we do this:
#define UI_SET_PHYS_COMPAT __IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t)
...
if (cmd == UI_SET_PHYS_COMPAT)
cmd = UI_SET_PHYS;
> return uinput_ioctl_handler(file, cmd, arg, compat_ptr(arg));
> }
> #endif
We can use the local define instead of manipulating cmd size because we
will never going to change UI_SET_PHYS definition, since it is part of
uapi.
Thanks.
--
Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS
2016-05-20 16:32 ` Dmitry Torokhov
@ 2016-05-20 17:50 ` Ricky Liang
0 siblings, 0 replies; 5+ messages in thread
From: Ricky Liang @ 2016-05-20 17:50 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: David Herrmann, Benjamin Tissoires, Andrew Morton,
Elias Vanderstuyft, Anshul Garg,
open list:INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN)...,
open list
Hi Dmitry,
On Sat, May 21, 2016 at 12:32 AM, Dmitry Torokhov
<dmitry.torokhov@gmail.com> wrote:
> Hi Ricky,
>
> On Tue, May 17, 2016 at 11:39:45PM +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>
>> ---
>> drivers/input/misc/uinput.c | 9 +++++++++
>> 1 file changed, 9 insertions(+)
>>
>> diff --git a/drivers/input/misc/uinput.c b/drivers/input/misc/uinput.c
>> index abe1a92..b4d1b1d 100644
>> --- a/drivers/input/misc/uinput.c
>> +++ b/drivers/input/misc/uinput.c
>> @@ -984,6 +984,15 @@ static long uinput_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
>> static long uinput_compat_ioctl(struct file *file,
>> unsigned int cmd, unsigned long arg)
>> {
>> + switch (_IOC_NR(cmd)) {
>> + case _IOC_NR(UI_SET_PHYS):
>> + if (_IOC_SIZE(cmd) == sizeof(compat_uptr_t)) {
>> + cmd &= ~IOCSIZE_MASK;
>> + cmd |= sizeof(void *) << IOCSIZE_SHIFT;
>> + }
>> + break;
>> + }
>> +
>
> This looks quite complicated... Can we do this:
>
> #define UI_SET_PHYS_COMPAT __IOW(UINPUT_IOCTL_BASE, 108, compat_uptr_t)
>
> ...
>
> if (cmd == UI_SET_PHYS_COMPAT)
> cmd = UI_SET_PHYS;
>
>> return uinput_ioctl_handler(file, cmd, arg, compat_ptr(arg));
>> }
>> #endif
>
> We can use the local define instead of manipulating cmd size because we
> will never going to change UI_SET_PHYS definition, since it is part of
> uapi.
Sounds good. I'll send v2 to implement this.
Thanks,
Ricky
>
> Thanks.
>
> --
> Dmitry
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] Input: uinput - handle compat ioctl for UI_SET_PHYS
2016-05-17 15:39 [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS Ricky Liang
2016-05-20 16:32 ` Dmitry Torokhov
@ 2016-05-20 17:50 ` Ricky Liang
2016-05-20 17:59 ` Dmitry Torokhov
1 sibling, 1 reply; 5+ messages in thread
From: Ricky Liang @ 2016-05-20 17:50 UTC (permalink / raw)
Cc: Ricky Liang, Dmitry Torokhov, David Herrmann, Benjamin Tissoires,
Anshul Garg, Elias Vanderstuyft, Andrew Morton,
open list:INPUT KEYBOARD, MOUSE, JOYSTICK , TOUCHSCREEN...,
open list
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>
---
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] Input: uinput - handle compat ioctl for UI_SET_PHYS
2016-05-20 17:50 ` [PATCH v2] " Ricky Liang
@ 2016-05-20 17:59 ` Dmitry Torokhov
0 siblings, 0 replies; 5+ messages in thread
From: Dmitry Torokhov @ 2016-05-20 17:59 UTC (permalink / raw)
To: Ricky Liang
Cc: David Herrmann, Benjamin Tissoires, Anshul Garg,
Elias Vanderstuyft, Andrew Morton,
open list:INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN)...,
open list
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-05-20 17:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-17 15:39 [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS Ricky Liang
2016-05-20 16:32 ` Dmitry Torokhov
2016-05-20 17:50 ` Ricky Liang
2016-05-20 17:50 ` [PATCH v2] " Ricky Liang
2016-05-20 17:59 ` Dmitry Torokhov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).