From patchwork Wed Aug 14 20:54:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 171367 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1320144ily; Wed, 14 Aug 2019 13:55:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyYHZ7jQ0hvJOpHkgq4rDiSwmY869KdswlyTicUsXhYsGpRqkbRYbSMGCsXhogkATTeyjX1 X-Received: by 2002:a63:40a:: with SMTP id 10mr868817pge.317.1565816147043; Wed, 14 Aug 2019 13:55:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565816147; cv=none; d=google.com; s=arc-20160816; b=SC2s7sgfPXkYcY2ai9R6tQPW9SfpQqOVrEbglKCQG5uIaAQmBtDEvahLyLDc+qD3jg ybhMqcgxW5L34RW5l433Z14e2yk2JLJ+ZiYfoV5OpKhKx1jo9uO2g78k01qIHhMFJRFC B4ZLUNXqLZWlYCj9ejzyODDcJJfqLaMR8/ZYpGiXBi0xpVFe8Os/z9gGMYbYQyiL/bJ0 ntn8CXTv70YFhNC+Z9oHGaaAoaL3CvU0WF2nj3faCJg6aLjOyivpJ7Nd4O4qVXx2zMQA P4dfQ/qTP4Lgze/lIb48+dgI3MaMIMDc3TouvTUrkrczbDRwXn9DdcL2ZSm1nQvdOsF0 mXug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=tQRYbdQ2j3I+hzksvnnpRkQ1iiqziGhM9S1G9Proj5w=; b=bKTSabyvxJv9QOK7XAFDzXIdbqearni8riuWue9N/lqyEENEmk8uAwQFkB6XtUCiwG fhrY3vnz6/RcSMDhHBjpeaEFYc5mKfn/NP832Fy8gB6BxPYyGEZ+iiB2k4MZC9Ycm9r5 1k9/EDCVE17J9lLoRmQpUh72vOQSBJaIcfGx7pKzmHi4Zg5UhjARbH0QO3VSZflKIvZi mocZkznX+kwvtgBauPxbAL49uHVJJJERBxawCua9NV+OFBSywQVVyj09oBk8kigaunA7 JUhdkOoJNpTtRMH8IngDTz9KveQkghNCQtzoxUGm0W4jPpXLij3GE0/luV/21lvW/VRr 2pqw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id w26si464408pfn.94.2019.08.14.13.55.46; Wed, 14 Aug 2019 13:55:47 -0700 (PDT) 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729946AbfHNUzp (ORCPT + 28 others); Wed, 14 Aug 2019 16:55:45 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:51841 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726166AbfHNUzp (ORCPT ); Wed, 14 Aug 2019 16:55:45 -0400 Received: from threadripper.lan ([149.172.19.189]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.129]) with ESMTPA (Nemesis) id 1MTRAS-1hqCnc1bOG-00TlOd; Wed, 14 Aug 2019 22:55:36 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk, linux-fsdevel@vger.kernel.org, Greg Kroah-Hartman , Jiri Slaby Cc: Arnd Bergmann , Dmitry Safonov , Johan Hovold Subject: [PATCH v5 11/18] tty: handle compat PPP ioctls Date: Wed, 14 Aug 2019 22:54:46 +0200 Message-Id: <20190814205521.122180-2-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20190814204259.120942-1-arnd@arndb.de> References: <20190814204259.120942-1-arnd@arndb.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:y1TEGeFNHzbv3ETSzk+Ge7p4uSUBKqjD+pi67GZ8vNmcEncSU+X 1IQY9Q6UrEwfRXHUMi3/6VO1B4JiA7auIN8FTuZkAd0aan9A+Sv1fJHZCOh8CaLkgr3WNe/ mb/zuw5Ipe5QabrBL0ZBpELKzmAg9ssO4IfGKeaazgB/e3vl2JjE+Z0l3MRiYRWXE7IVYzd f6S52cChTD9gcOj6xchjg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:BcyhzUX7r0k=:36Bg5SmEhv6QI58j05fqOJ zRFzfLjnx2+NXJ94g6sbAlbxkt1G1kfNu0ThXI689mhlP4PlymW33q6B9YxfN8SiSfj9vsK2s NDiRg6SPt/oBWnGC9F2NZO7kGrPcTePqAOCRUd0u5Qt3BrdgMJSaNEhErHlJzKYIV6sd4cfag Vu62mgxv/3rOljIz+64aaTKk16eXsLmKQ/Ntt6G5NvpZvXphS/sJ/YzePF+vH8/uS/4YYiIjw zuD5wUuhJQM9hStTJEjztHvwVSf0/CFUfqkuXzZSCsPP6fAVfxvCcgBLhSFqABLhBZt6dRw3H ndTiIsBSaCMPtBjCHDl3NLLBr1Ep7mvhiM14AeuTsLr2s1+/vLoOaIvZ0rikQIuxD8tjVFsAt SQmdxZn/VsACNHRoiAWHSLMRfHJdte4M7xWDS/OIB8LtZeGdWicfo7vP9zLg7EHs+ZlHrZCjk Abq0duqYJur3IPp/IoLRgHTC5puRC57dblZsM1kM9AxkBmsJZ0lAVCWUmvrYnAj5g3x48/6Kz dJSJeSkjS/rLCMoHoPRVLAK//powwIz7eDzqjEX9laHSwVh2K8rXS9ayRlbnSMt7GYJZZHR1J 7jIVvNng3jE+R8ywVzIiL4VyXBGqmuAAjTh4sEmfxTZmNKxu0sMHLO1qQbNPyYjwttARiDhzm XNek1pPVFmVUsKDNE/up0qrtWiQ9qr8Xq59cY6yKBjV2rQk26bttdYWcbsKLwKZm9TQNsISbw vmxc/G7hmEN1/rxyRj5ntic86Q7RX3JObMaWyA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Multiple tty devices are have tty devices that handle the PPPIOCGUNIT and PPPIOCGCHAN ioctls. To avoid adding a compat_ioctl handler to each of those, add it directly in tty_compat_ioctl so we can remove the calls from fs/compat_ioctl.c. Signed-off-by: Arnd Bergmann --- drivers/tty/tty_io.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.20.0 Reviewed-by: Greg Kroah-Hartman diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index cee8b69c6f72..bf5241e0d772 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -87,6 +87,7 @@ #include #include #include +#include #include #include #include @@ -2811,6 +2812,9 @@ static long tty_compat_ioctl(struct file *file, unsigned int cmd, #endif case TIOCGSOFTCAR: case TIOCSSOFTCAR: + + case PPPIOCGCHAN: + case PPPIOCGUNIT: return tty_ioctl(file, cmd, (unsigned long)compat_ptr(arg)); case TIOCCONS: case TIOCEXCL: