From: Ricky Liang <jcliang@chromium.org>
Cc: Ricky Liang <jcliang@chromium.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
David Herrmann <dh.herrmann@gmail.com>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Andrew Morton <akpm@linux-foundation.org>,
Elias Vanderstuyft <elias.vds@gmail.com>,
Anshul Garg <aksgarg1989@gmail.com>,
"open list:INPUT KEYBOARD, MOUSE, JOYSTICK ,
TOUCHSCREEN..." <linux-input@vger.kernel.org>,
open list <linux-kernel@vger.kernel.org>
Subject: [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS
Date: Tue, 17 May 2016 23:39:45 +0800 [thread overview]
Message-ID: <1463499587-21346-1-git-send-email-jcliang@chromium.org> (raw)
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
next reply other threads:[~2016-05-17 15:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-17 15:39 Ricky Liang [this message]
2016-05-20 16:32 ` [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463499587-21346-1-git-send-email-jcliang@chromium.org \
--to=jcliang@chromium.org \
--cc=akpm@linux-foundation.org \
--cc=aksgarg1989@gmail.com \
--cc=benjamin.tissoires@redhat.com \
--cc=dh.herrmann@gmail.com \
--cc=dmitry.torokhov@gmail.com \
--cc=elias.vds@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).