From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752581AbcETRvI (ORCPT ); Fri, 20 May 2016 13:51:08 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:34028 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751376AbcETRvF (ORCPT ); Fri, 20 May 2016 13:51:05 -0400 From: Ricky Liang Cc: Ricky Liang , Dmitry Torokhov , David Herrmann , Benjamin Tissoires , Anshul Garg , Elias Vanderstuyft , Andrew Morton , linux-input@vger.kernel.org (open list:INPUT (KEYBOARD, MOUSE, JOYSTICK , TOUCHSCREEN)...), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2] Input: uinput - handle compat ioctl for UI_SET_PHYS Date: Sat, 21 May 2016 01:50:46 +0800 Message-Id: <1463766648-2392-1-git-send-email-jcliang@chromium.org> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1463499587-21346-1-git-send-email-jcliang@chromium.org> References: <1463499587-21346-1-git-send-email-jcliang@chromium.org> To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- 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