From patchwork Fri Jan 8 07:50:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bamvor Zhang Jian X-Patchwork-Id: 59331 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp393999lbb; Thu, 7 Jan 2016 23:53:37 -0800 (PST) X-Received: by 10.98.8.14 with SMTP id c14mr2411334pfd.42.1452239616899; Thu, 07 Jan 2016 23:53:36 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gw4si73281933pac.129.2016.01.07.23.53.36; Thu, 07 Jan 2016 23:53:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754124AbcAHHw7 (ORCPT + 29 others); Fri, 8 Jan 2016 02:52:59 -0500 Received: from mail-pf0-f171.google.com ([209.85.192.171]:34774 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752580AbcAHHwU (ORCPT ); Fri, 8 Jan 2016 02:52:20 -0500 Received: by mail-pf0-f171.google.com with SMTP id q63so6425167pfb.1 for ; Thu, 07 Jan 2016 23:52:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=I/i25ar3BMvvdNQlknq5LSkymHGRsG6TNywSe9/G8bE=; b=BetCcY9SulEhrrHOt7jp/5+aBzo260zdwp2Z91zEGvhpWwqVegjUVESUhVhpwDkL9H VE/7os9kcgjN+0rIGaNqe/gUN4jTctmt2B7NlFqdfvNUBu0qJs93d7tWRu0NxvyMJn/L zQfs2es7uTNlLJRv8nEfyow+1q4Oi4Ie95s7o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=I/i25ar3BMvvdNQlknq5LSkymHGRsG6TNywSe9/G8bE=; b=fye4YbHUXadR0ZsjOFrdAZw6XAsuBYyBdtVusg57DITcaAq0ci3ikBb1vbRsT3qgFL B1PE4vpLfmfFlNilr+e1J/ZLMZjJanvwmETmktx5h1pvJanJQF53nJAdScOlKTVJPEn3 favQunKwHtwUJmQWBMBf1kTYSE65JImRA26rHkkfZtkPfwzQTPIl3hn9St4L61M1T3aM EavAwvhN9umICRY/kUq6JpXlWVkSGmNZQxbn8MFzG0dbiux6REfB0lI+EGzXCZzStT4P FlqXm7GHFvHDMBuwJwRjR+GTyPJ/SldkQm6Nphnt4a+Kz6rQvLJHuROzDG463qx62BFp R6OA== X-Gm-Message-State: ALoCoQkQpDzV1/yIpxhU/75wacNOnDqfyzXkW7s2zHuvQeSes8Y45o12659kuQ8CeKLEitEQF+a7TvVOjoT4doqopxXPlVv6TQ== X-Received: by 10.98.12.6 with SMTP id u6mr656845pfi.155.1452239540321; Thu, 07 Jan 2016 23:52:20 -0800 (PST) Received: from linux-j170.site ([116.251.213.227]) by smtp.gmail.com with ESMTPSA id y86sm2519253pfa.26.2016.01.07.23.52.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jan 2016 23:52:19 -0800 (PST) From: Bamvor Jian Zhang To: linux-kernel@vger.kernel.org Cc: y2038@lists.linaro.org, gregkh@linuxfoundation.org, arnd@arndb.de, sudipm.mukherjee@gmail.com, broonie@kernel.org, Bamvor Jian Zhang Subject: [PATCH v4 2/3] ppdev: add support for compat ioctl Date: Fri, 8 Jan 2016 15:50:49 +0800 Message-Id: <1452239450-19783-3-git-send-email-bamvor.zhangjian@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452239450-19783-1-git-send-email-bamvor.zhangjian@linaro.org> References: <1452239450-19783-1-git-send-email-bamvor.zhangjian@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The arg of ioctl in ppdev is the pointer of integer except the timeval in PPSETTIME, PPGETTIME. Different size of timeval is already supported by the previous patches. So, it is safe to add compat support. Signed-off-by: Bamvor Jian Zhang Reviewed-by: Arnd Bergmann Tested-by: Sudip Mukherjee --- drivers/char/ppdev.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.1.4 diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index c03d998..9e98d01 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c @@ -69,6 +69,7 @@ #include #include #include +#include #define PP_VERSION "ppdev: user-space parallel port driver" #define CHRDEV "ppdev" @@ -670,6 +671,14 @@ static long pp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) return ret; } +#ifdef CONFIG_COMPAT +static long pp_compat_ioctl(struct file *file, unsigned int cmd, + unsigned long arg) +{ + return pp_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); +} +#endif + static int pp_open (struct inode * inode, struct file * file) { unsigned int minor = iminor(inode); @@ -779,6 +788,9 @@ static const struct file_operations pp_fops = { .write = pp_write, .poll = pp_poll, .unlocked_ioctl = pp_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = pp_compat_ioctl, +#endif .open = pp_open, .release = pp_release, };