From patchwork Tue Jul 20 14:46:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 481525 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5228627jao; Tue, 20 Jul 2021 08:17:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlT/1R0daLOSXMMe7pYt2M0pvjc7EZ3l8v/kNlrhYokPQ/MvvCTsTLTqUo5jCvR4DiKetm X-Received: by 2002:a05:6512:3116:: with SMTP id n22mr22026383lfb.170.1626794219979; Tue, 20 Jul 2021 08:16:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626794219; cv=none; d=google.com; s=arc-20160816; b=Zb3skkODmRdUPoznRTTKDmH44q/0Oas0JLT3Sk/GZwIAKaWvTibrBWhNY3PwwcWAmh vSZD9iqNgCQytRRpd10eF5sSXxuUq/RFJ6Zn/1FR179h8ox6WIX6P8Xrs80D3VZENHiY XCLcjHJiaCNE1AI+F3yxFCwfVvNO9MKPYRo/9prURfksuV/qqJtCWclGqxK/DiXWKZqW K7ebmMs4ECtHpB64IMr1agYYAg95x0+vPweZF2Iw/e9h5vfDODEY8vkSZhiXx/WjJB9/ M5vQbwOSUDMjxAFR47J6GztF5mtWLXsplEqhzcfTWetTIJClFiF95kln7B88yz/IRJrc bz3Q== 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=4IQuqws10R03UGg7qhVWfgK5GrLPkRYKSaU+1pem9Co=; b=GwQnikpXbhxG+ya+R7PhbIX+Ao5u7fGHus9Sx8BjUTmINtASE1m+tL1OG4GUeO9C5J CjbPpRlWSoyfzkkVN839G/DLIs35M+gNSw19qQko6TMkELExk7yJubSYxelyTxC4fdcc HHN35j8gO7TwvlsS853pgSl95Osk6wDibikw5lxs4iI3tJPZx7dS0cI9pPEjKLeOU/VN uPvnN+TdkMCrblmdWzmbp2y2T8mdEv3IEunBzeQGO+MJMBsu0oP/urd8+uVYiClzPO+c mhx4BijoTjWqdul/qShiXgORxpVwg/+3dVBsFb2cdZilQMqcZkgsKIs+XkgAus8umvaL empg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=nDu06lJB; 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 j8si24247821ljq.554.2021.07.20.08.16.59; Tue, 20 Jul 2021 08:16:59 -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=nDu06lJB; 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 S239540AbhGTOeI (ORCPT + 8 others); Tue, 20 Jul 2021 10:34:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:55416 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238651AbhGTONr (ORCPT ); Tue, 20 Jul 2021 10:13:47 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 48FE361244; Tue, 20 Jul 2021 14:47:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626792423; bh=ae1hfH8QF/RCzo7dEv8MK0I6559MFhj95aqCe+aAmz0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nDu06lJB8KNGIbyWt04e9g3YRNVrhASSjLgSgsyX+sesUAvB+ddVrjQwcfcdK72/f VBdMDWrfDmWmMerXb0+sAUxc90NFDcdvi3TIN/MhQ7iFVUOAyamjCLCh2/jgM6vqWI pD9HQbZBn3a0L41BFKcXh4mjVgxFW73ZjNC3iiltlr7N/SM0/B4RQ/qTh8An7lLyRy kDUHqw80/MKvIqyGEBy46AM93hIfZkFyfNLzrlcYB3nK0AtSgGkqF0uUQz9rMtv4LP 9CX2az37NFsu0V3lixvNSlyb2aWGWI3NUjLNvhBubXjn+oBOSXXPjilTjPFWE+VGB+ rVBOwjUTpswxw== From: Arnd Bergmann To: netdev@vger.kernel.org Cc: Christoph Hellwig , Arnd Bergmann Subject: [PATCH net-next v2 09/31] appletalk: use ndo_siocdevprivate Date: Tue, 20 Jul 2021 16:46:16 +0200 Message-Id: <20210720144638.2859828-10-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 appletalk has three SIOCDEVPRIVATE ioctl commands that are broken in compat mode because the passed structure contains a pointer. Change it over to ndo_siocdevprivate for consistency and make it return an error when called in compat mode. This could be fixed if there are still users. Signed-off-by: Arnd Bergmann --- drivers/net/appletalk/ipddp.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) -- 2.29.2 diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index 51cf5eca9c7f..5566daefbff4 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c @@ -54,11 +54,12 @@ static netdev_tx_t ipddp_xmit(struct sk_buff *skb, static int ipddp_create(struct ipddp_route *new_rt); static int ipddp_delete(struct ipddp_route *rt); static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt); -static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); +static int ipddp_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *data, int cmd); static const struct net_device_ops ipddp_netdev_ops = { .ndo_start_xmit = ipddp_xmit, - .ndo_do_ioctl = ipddp_ioctl, + .ndo_siocdevprivate = ipddp_siocdevprivate, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, }; @@ -268,15 +269,18 @@ static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt) return NULL; } -static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) +static int ipddp_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *data, int cmd) { - struct ipddp_route __user *rt = ifr->ifr_data; struct ipddp_route rcp, rcp2, *rp; + if (in_compat_syscall()) + return -EOPNOTSUPP; + if(!capable(CAP_NET_ADMIN)) return -EPERM; - if(copy_from_user(&rcp, rt, sizeof(rcp))) + if (copy_from_user(&rcp, data, sizeof(rcp))) return -EFAULT; switch(cmd) @@ -296,7 +300,7 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) spin_unlock_bh(&ipddp_route_lock); if (rp) { - if (copy_to_user(rt, &rcp2, + if (copy_to_user(data, &rcp2, sizeof(struct ipddp_route))) return -EFAULT; return 0;