linux-input.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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>,
	Anshul Garg <aksgarg1989@gmail.com>,
	Elias Vanderstuyft <elias.vds@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	"open list:INPUT KEYBOARD, MOUSE, JOYSTICK ,
	TOUCHSCREEN..." <linux-input@vger.kernel.org>,
	open list <linux-kernel@vger.kernel.org>
Subject: [PATCH v2] Input: uinput - handle compat ioctl for UI_SET_PHYS
Date: Sat, 21 May 2016 01:50:46 +0800	[thread overview]
Message-ID: <1463766648-2392-1-git-send-email-jcliang@chromium.org> (raw)
In-Reply-To: <1463499587-21346-1-git-send-email-jcliang@chromium.org>

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


  parent reply	other threads:[~2016-05-20 17:51 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 ` Ricky Liang [this message]
2016-05-20 17:59   ` [PATCH v2] " 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=1463766648-2392-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).