linux-kernel - [PATCH] 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 for Android: free password hash cracker in your pocket

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

Message-Id: <1463499587-21346-1-git-send-email-jcliang@chromium.org>
Date:	Tue, 17 May 2016 23:39:45 +0800
From:	Ricky Liang <jcliang@...omium.org>
To:	unlisted-recipients:; (no To-header on input)
Cc:	Ricky Liang <jcliang@...omium.org>,
	Dmitry Torokhov <dmitry.torokhov@...il.com>,
	David Herrmann <dh.herrmann@...il.com>,
	Benjamin Tissoires <benjamin.tissoires@...hat.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Elias Vanderstuyft <elias.vds@...il.com>,
	Anshul Garg <aksgarg1989@...il.com>,
	linux-input@...r.kernel.org (open list:INPUT (KEYBOARD, MOUSE, JOYSTICK
	, TOUCHSCREEN)...), linux-kernel@...r.kernel.org (open list)
Subject: [PATCH] Input: uinput - handle compat ioctl for UI_SET_PHYS

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>
---
 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