From patchwork Tue Jul 20 14:46:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 481538 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5238061jao; Tue, 20 Jul 2021 08:27:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy+f5cnvCbvv3L+GL80Su97z0wOVvNe/CDTaohieqbAFeaD/pR2rHO7sFnPcB7JLe7PH0Rr X-Received: by 2002:a02:2b21:: with SMTP id h33mr26391471jaa.31.1626794877990; Tue, 20 Jul 2021 08:27:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626794877; cv=none; d=google.com; s=arc-20160816; b=xeHc0ZrXxOac87RFdS1AyVhzronrYt6OvCWIiW5QI27zYY76wndrg8t8040Pyp4lMz sf6Rym0gQhpjuqPQPKE6DsJZZle/k5nk0ec6g4phYaFB3Hs3/cGfigEgOcJPQlQaaPPH jQd6QDKAlRdhgxwBQHGDq0q2RojmZr4anJSLPFsMviyREfNxfHhwKj9XnGtCSaG28ybc LadA/oc9WE57nW4ixZ42ftpkB83rInZqfajaE20RdAyavBYS6pE7SCfCh/xj1fM7mgmb Dy3Nsoo9/EaTOS7xsxT57GTCfCKx/pAcsNfrPuHpoaF5aqCTIG8h/JC5MgTKIq+031Rm s9Eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=m0HyzUfR67O91OiKE4BUOkC5E1qG+4frVZeioQcE7k8=; b=a7Q52sGX15KGdHLH4ZBy+IIqJlpzJabgLOIT+cHaTrvDgydUncDpySwY7DUgyNhWa2 em7QkLGIy5Z18rIayz08XlRqaMwUP08/z3khGTUSYG6w4n/83TGI5KTNUqO4LqE1sATI 9Nqj4JsbrOaHf77hBEXQ/YATqZHUQwXTLf0FsSuzDH8KsiTkw0QVY2FpJ/Ms1fxkHh+k fX7M492oMOpx1ny2UM32eSuOecQDG8/tdBfLLUqvZG54MavLYV0jOpM4qJiDTsQQMyv3 2J+JCjxE8uA2Y17lypFTHfUKGQfuGJSXeD0bgDbyeZoBWs0jaW6vspQAlSUjh2ewjqyp y+xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=g2L2Uvj9; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o7si26753193ilc.64.2021.07.20.08.27.57; Tue, 20 Jul 2021 08:27:57 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=g2L2Uvj9; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240336AbhGTOn5 (ORCPT + 8 others); Tue, 20 Jul 2021 10:43:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:57366 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239807AbhGTOUs (ORCPT ); Tue, 20 Jul 2021 10:20:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3EDA16124C; Tue, 20 Jul 2021 14:47:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626792430; bh=9/u5Ur/k/uSU/NAsBfy4KiRP2e5RCOOh3IVfmej+eLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g2L2Uvj95KFodAch/ga9GOF46Gfb9Nn0PbL0DbMx4Un1C4G9EKDJlhQgYF/NDRzl5 4LkKELB/UQwv47JcmfYO8gHCkkXYxaR79lkLvBHm2pPjuQDeg1BZmM2yQb2V9KRJtG HJ54IrlIRxS5yX8zqbH0B2cqaznQSdZBF+OT//1PKAC1Nhw/qFPk5AQyjhJiVB3XRW 2P5UbbYMhP2Ry+gQbBiWYdRWWHT2Q+YV2RvZxFe7nQQupjT0mgdVy/qZp6cRp093uK nD4q2NwCzxrEdB0uuv0Bwt7llprHjaShV/pRgLJXXYS+uk1qqnzhdYR3zHgnQdQgpX LAqQCJr+vge7w== From: Arnd Bergmann To: netdev@vger.kernel.org Cc: Christoph Hellwig , Arnd Bergmann Subject: [PATCH net-next v2 15/31] slip/plip: use ndo_siocdevprivate Date: Tue, 20 Jul 2021 16:46:22 +0200 Message-Id: <20210720144638.2859828-16-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210720144638.2859828-1-arnd@kernel.org> References: <20210720144638.2859828-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann slip and plip both use a couple of SIOCDEVPRIVATE ioctl commands that overload the ifreq layout in a way that is incompatible with compat mode. Convert to use ndo_siocdevprivate to allow passing the data this way, but return an error in compat mode anyway because the private structure is still incompatible. This could be fixed as well to make compat work properly. Signed-off-by: Arnd Bergmann --- drivers/net/plip/plip.c | 12 +++++++++--- drivers/net/slip/slip.c | 13 +++++++++---- 2 files changed, 18 insertions(+), 7 deletions(-) -- 2.29.2 diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c index e26cf91bdec2..82d609401711 100644 --- a/drivers/net/plip/plip.c +++ b/drivers/net/plip/plip.c @@ -84,6 +84,7 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n" extra grounds are 18,19,20,21,22,23,24 */ +#include #include #include #include @@ -150,7 +151,8 @@ static int plip_hard_header_cache(const struct neighbour *neigh, struct hh_cache *hh, __be16 type); static int plip_open(struct net_device *dev); static int plip_close(struct net_device *dev); -static int plip_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); +static int plip_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *data, int cmd); static int plip_preempt(void *handle); static void plip_wakeup(void *handle); @@ -265,7 +267,7 @@ static const struct net_device_ops plip_netdev_ops = { .ndo_open = plip_open, .ndo_stop = plip_close, .ndo_start_xmit = plip_tx_packet, - .ndo_do_ioctl = plip_ioctl, + .ndo_siocdevprivate = plip_siocdevprivate, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, }; @@ -1207,7 +1209,8 @@ plip_wakeup(void *handle) } static int -plip_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +plip_siocdevprivate(struct net_device *dev, struct ifreq *rq, + void __user *data, int cmd) { struct net_local *nl = netdev_priv(dev); struct plipconf *pc = (struct plipconf *) &rq->ifr_ifru; @@ -1215,6 +1218,9 @@ plip_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) if (cmd != SIOCDEVPLIP) return -EOPNOTSUPP; + if (in_compat_syscall()) + return -EOPNOTSUPP; + switch(pc->pcmd) { case PLIP_GET_TIMEOUT: pc->trigger = nl->trigger; diff --git a/drivers/net/slip/slip.c b/drivers/net/slip/slip.c index dc84cb844319..5435b5689ce6 100644 --- a/drivers/net/slip/slip.c +++ b/drivers/net/slip/slip.c @@ -62,6 +62,7 @@ */ #define SL_CHECK_TRANSMIT +#include #include #include @@ -108,7 +109,7 @@ static void slip_unesc6(struct slip *sl, unsigned char c); #ifdef CONFIG_SLIP_SMART static void sl_keepalive(struct timer_list *t); static void sl_outfill(struct timer_list *t); -static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); +static int sl_siocdevprivate(struct net_device *dev, struct ifreq *rq, void __user *data, int cmd); #endif /******************************** @@ -647,7 +648,7 @@ static const struct net_device_ops sl_netdev_ops = { .ndo_change_mtu = sl_change_mtu, .ndo_tx_timeout = sl_tx_timeout, #ifdef CONFIG_SLIP_SMART - .ndo_do_ioctl = sl_ioctl, + .ndo_siocdevprivate = sl_siocdevprivate, #endif }; @@ -1179,11 +1180,12 @@ static int slip_ioctl(struct tty_struct *tty, struct file *file, /* VSV changes start here */ #ifdef CONFIG_SLIP_SMART -/* function do_ioctl called from net/core/dev.c +/* function sl_siocdevprivate called from net/core/dev.c to allow get/set outfill/keepalive parameter by ifconfig */ -static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +static int sl_siocdevprivate(struct net_device *dev, struct ifreq *rq, + void __user *data, int cmd) { struct slip *sl = netdev_priv(dev); unsigned long *p = (unsigned long *)&rq->ifr_ifru; @@ -1191,6 +1193,9 @@ static int sl_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) if (sl == NULL) /* Allocation failed ?? */ return -ENODEV; + if (in_compat_syscall()) + return -EOPNOTSUPP; + spin_lock_bh(&sl->lock); if (!sl->tty) {