From patchwork Tue Jul 20 14:46:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 481557 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5248383jao; Tue, 20 Jul 2021 08:39:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz/82hx1Eh8eTRYv9iIhmG7BVoLzumHD8G0tl08Yy7RcrQYLczPgL7vXTkd7CnTPqFh7o9T X-Received: by 2002:a17:906:3942:: with SMTP id g2mr33886800eje.317.1626795577379; Tue, 20 Jul 2021 08:39:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626795577; cv=none; d=google.com; s=arc-20160816; b=YflE0aY/7sbk4ojufDfWZtjCQel0BSdy/WV3jYYK5JjsoBjhO5R0Dl4X+H10uA+Yg1 yyUmSD/uVOtZyqEvsqucA7GKTYCkKEttlUuqyONms5wj05ix8fVfnzxYRq9Mc0gO2qLS vUTmPyHrK+zff9DxwG+anuAIfIYV7m7vXx1Q5YlSVR4utzoAwHEMiPdyXTlmgCDTLMm1 KibGP6isibsxN8vshf1fobmfDy13NQ2sJdXwJithirB9iePVB4ewuBXAG4W/gOxJrJUW lP6MxwDQjmKP7/VDCBLzwIFMJTwZ4tCg3Cw6qnhoX9YpMFt8NyCwu0nGuTGv/FldtPwr +KgA== 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=XFB8zGhcpVdu+lC5caQgl7YhqFesXSPb/mDe5VTZJD0=; b=l//TQwfhaS/zY39AUmojF4R3YtnsAE9RBKmjvt4+OaDecEZCPjGwUkzyNXDnW6YZC/ x5TxrZxtWTE5eHKvoZAQuRivUwo8faBR/09Rpv5IATvgn5DdR9hFvT82Y0lE0hdr+aGi hXMzVd1xGWhmens8FoxREvUWISUnL14qFS7KbzgDrwCcXcvRxDoHKlfqZFdiPzcTV40n +uAc5WD2hwCcBTB8LnoIC4Hr0fHTO4IUhu5U4vioHo2Iycc3MZ167GGF8HdBLV2Qg/Zz 2rkviz0d+WFJQTF11AvushYRH5JIFqVfRPrTlb1pwgIBmei3v6ZOFcLkiB7vmNi2dJeS t7jQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Xt3g+lMT; 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 b7si160517edd.497.2021.07.20.08.39.37; Tue, 20 Jul 2021 08:39:37 -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=Xt3g+lMT; 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 S241847AbhGTOya (ORCPT + 8 others); Tue, 20 Jul 2021 10:54:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:36042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240450AbhGTOaw (ORCPT ); Tue, 20 Jul 2021 10:30:52 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 51D186120F; Tue, 20 Jul 2021 14:46:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626792416; bh=I8vyS+/Pjbcd6AJ+GB5Pnp5mSYNlThQR0Wnf5h6uVBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Xt3g+lMTNtVq7/fN3uwj23zYpdVfwuVWRE1jh5eQ8CBfEH5riAQ2Ng+iHXhnfeHgH uElCRDIygI0tloddDcvyre5wYGdrOR69cN56DCk8MdYmpfZdarC5IiiZbwE8Fe2wAK Xl2HL1LeKyzMPfBrAhs+9GeYIFQJ12zjuu/59boxLllbK/v9+K4CatU4mM04Fyrj1Y BWhPzSmO57zxlIo+OQSVhnbILfPDZXARaKtHRDRJ4ufOQQ2BRR6+mrRPxoHu+aibv/ hWSlwERcLRmAMzOBbnXZz8Bh9JU9ij4M3dME0CQN/B57w9JSgKuY936BPDjblmjrIa CzXJNsM6WJipA== From: Arnd Bergmann To: netdev@vger.kernel.org Cc: Christoph Hellwig , Arnd Bergmann Subject: [PATCH net-next v2 03/31] staging: wlan-ng: use siocdevprivate Date: Tue, 20 Jul 2021 16:46:10 +0200 Message-Id: <20210720144638.2859828-4-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 wlan-ng has two private ioctls that correctly work in compat mode. Move these over to the new ndo_siocdevprivate mechanism. The p80211netdev_ethtool() function is commented out and has no use here, so this can be removed Signed-off-by: Arnd Bergmann --- drivers/staging/wlan-ng/p80211netdev.c | 76 ++++---------------------- 1 file changed, 11 insertions(+), 65 deletions(-) -- 2.29.2 diff --git a/drivers/staging/wlan-ng/p80211netdev.c b/drivers/staging/wlan-ng/p80211netdev.c index 6f470e7ba647..1c62130a5eee 100644 --- a/drivers/staging/wlan-ng/p80211netdev.c +++ b/drivers/staging/wlan-ng/p80211netdev.c @@ -98,8 +98,8 @@ static int p80211knetdev_stop(struct net_device *netdev); static netdev_tx_t p80211knetdev_hard_start_xmit(struct sk_buff *skb, struct net_device *netdev); static void p80211knetdev_set_multicast_list(struct net_device *dev); -static int p80211knetdev_do_ioctl(struct net_device *dev, struct ifreq *ifr, - int cmd); +static int p80211knetdev_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *data, int cmd); static int p80211knetdev_set_mac_address(struct net_device *dev, void *addr); static void p80211knetdev_tx_timeout(struct net_device *netdev, unsigned int txqueue); static int p80211_rx_typedrop(struct wlandevice *wlandev, u16 fc); @@ -461,56 +461,8 @@ static void p80211knetdev_set_multicast_list(struct net_device *dev) wlandev->set_multicast_list(wlandev, dev); } -#ifdef SIOCETHTOOL - -static int p80211netdev_ethtool(struct wlandevice *wlandev, - void __user *useraddr) -{ - u32 ethcmd; - struct ethtool_drvinfo info; - struct ethtool_value edata; - - memset(&info, 0, sizeof(info)); - memset(&edata, 0, sizeof(edata)); - - if (copy_from_user(ðcmd, useraddr, sizeof(ethcmd))) - return -EFAULT; - - switch (ethcmd) { - case ETHTOOL_GDRVINFO: - info.cmd = ethcmd; - snprintf(info.driver, sizeof(info.driver), "p80211_%s", - wlandev->nsdname); - snprintf(info.version, sizeof(info.version), "%s", - WLAN_RELEASE); - - if (copy_to_user(useraddr, &info, sizeof(info))) - return -EFAULT; - return 0; -#ifdef ETHTOOL_GLINK - case ETHTOOL_GLINK: - edata.cmd = ethcmd; - - if (wlandev->linkstatus && - (wlandev->macmode != WLAN_MACMODE_NONE)) { - edata.data = 1; - } else { - edata.data = 0; - } - - if (copy_to_user(useraddr, &edata, sizeof(edata))) - return -EFAULT; - return 0; -#endif - } - - return -EOPNOTSUPP; -} - -#endif - /*---------------------------------------------------------------- - * p80211knetdev_do_ioctl + * p80211knetdev_siocdevprivate * * Handle an ioctl call on one of our devices. Everything Linux * ioctl specific is done here. Then we pass the contents of the @@ -537,8 +489,9 @@ static int p80211netdev_ethtool(struct wlandevice *wlandev, * locks. *---------------------------------------------------------------- */ -static int p80211knetdev_do_ioctl(struct net_device *dev, - struct ifreq *ifr, int cmd) +static int p80211knetdev_siocdevprivate(struct net_device *dev, + struct ifreq *ifr, + void __user *data, int cmd) { int result = 0; struct p80211ioctl_req *req = (struct p80211ioctl_req *)ifr; @@ -547,13 +500,8 @@ static int p80211knetdev_do_ioctl(struct net_device *dev, netdev_dbg(dev, "rx'd ioctl, cmd=%d, len=%d\n", cmd, req->len); -#ifdef SIOCETHTOOL - if (cmd == SIOCETHTOOL) { - result = - p80211netdev_ethtool(wlandev, (void __user *)ifr->ifr_data); - goto bail; - } -#endif + if (in_compat_syscall()) + return -EOPNOTSUPP; /* Test the magic, assume ifr is good if it's there */ if (req->magic != P80211_IOCTL_MAGIC) { @@ -569,7 +517,7 @@ static int p80211knetdev_do_ioctl(struct net_device *dev, goto bail; } - msgbuf = memdup_user(req->data, req->len); + msgbuf = memdup_user(data, req->len); if (IS_ERR(msgbuf)) { result = PTR_ERR(msgbuf); goto bail; @@ -578,10 +526,8 @@ static int p80211knetdev_do_ioctl(struct net_device *dev, result = p80211req_dorequest(wlandev, msgbuf); if (result == 0) { - if (copy_to_user - (req->data, msgbuf, req->len)) { + if (copy_to_user(data, msgbuf, req->len)) result = -EFAULT; - } } kfree(msgbuf); @@ -682,7 +628,7 @@ static const struct net_device_ops p80211_netdev_ops = { .ndo_stop = p80211knetdev_stop, .ndo_start_xmit = p80211knetdev_hard_start_xmit, .ndo_set_rx_mode = p80211knetdev_set_multicast_list, - .ndo_do_ioctl = p80211knetdev_do_ioctl, + .ndo_siocdevprivate = p80211knetdev_siocdevprivate, .ndo_set_mac_address = p80211knetdev_set_mac_address, .ndo_tx_timeout = p80211knetdev_tx_timeout, .ndo_validate_addr = eth_validate_addr,