From patchwork Thu Dec 31 14:06:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bamvor Zhang Jian X-Patchwork-Id: 59096 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp3448207lbb; Thu, 31 Dec 2015 06:07:12 -0800 (PST) X-Received: by 10.98.75.10 with SMTP id y10mr101175337pfa.86.1451570831449; Thu, 31 Dec 2015 06:07:11 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rf10si29130492pab.94.2015.12.31.06.07.11; Thu, 31 Dec 2015 06:07:11 -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=neutral (body hash did not verify) header.i=@linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753394AbbLaOHD (ORCPT + 29 others); Thu, 31 Dec 2015 09:07:03 -0500 Received: from mail-pf0-f171.google.com ([209.85.192.171]:35002 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752186AbbLaOGz (ORCPT ); Thu, 31 Dec 2015 09:06:55 -0500 Received: by mail-pf0-f171.google.com with SMTP id 78so156965798pfw.2 for ; Thu, 31 Dec 2015 06:06:54 -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=i3z4b6d2wCCP4VpOKgL6CCYtXh5/LiNFihhi6tktD9DONM8JtUcs53xPjcLAaRT4bO vS3lOYxk1kvS5sV3cMEk4QXoxQEeZy+OqZSSRGHdVYyvj8Q0d/q7M1PF6+ajTm3IawoG yXr0bNPoLpYCqw+Ox+D/w6Kq9/TRmnKaUa+Hs= 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=Wwq2uTLCMGZFSsTDXXW8wrc+7FWaaxXvdw4OJ8GDBXlj9uNa0WXgof/RgJBR9cAicy 6ocMQPmEV6ngSTmCUVNqVDA3ekVvaFUwBimkXP4IwFlBxCgPH57x4ejRPyR5vmNSKxD5 HXpy1iz9t1uLTs+a0fFFQeKn2hgF9VVFgLv57DDuCdnj10BLQUDeZoBOD4lSN0zvykym NAxFf/3Qd3+OqZQHfY8Rakn7GSMpguamweWknJCMHYzNJfKg8zRju+oTDTgs1U2lZ0dy nNLUsX3xRWQH0J7Y2RWJwUGjud5uUmVoHzTmcgu7IA2PBB9aWEXCQg6X1z6JJM+rJeg7 taPg== X-Gm-Message-State: ALoCoQn/pRZ5PqWxnGYpxww0w7zphlkyGDlLl8txAXPXZja0atjYWIFyphsNYlykXHkD0SyXpQBuAHNzlbTgss071ajSQLu44w== X-Received: by 10.98.79.25 with SMTP id d25mr50623404pfb.44.1451570814631; Thu, 31 Dec 2015 06:06:54 -0800 (PST) Received: from linux-j170.lan ([211.22.145.200]) by smtp.gmail.com with ESMTPSA id k77sm15355770pfb.37.2015.12.31.06.06.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Dec 2015 06:06:53 -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 v3 2/2] ppdev: add support for compat ioctl Date: Thu, 31 Dec 2015 22:06:34 +0800 Message-Id: <1451570794-14263-3-git-send-email-bamvor.zhangjian@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1451570794-14263-1-git-send-email-bamvor.zhangjian@linaro.org> References: <1451570794-14263-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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ 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, };