From patchwork Tue Jul 27 13:45:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 486714 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp232428jas; Tue, 27 Jul 2021 06:47:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyp0ZUa4uWOWw7VLLFXvQpX9fsosKaAL76in9tfgjABXDEc1cMUViOpv7xHjQJlCTG5rZSd X-Received: by 2002:a05:6402:1d25:: with SMTP id dh5mr12975458edb.80.1627393634886; Tue, 27 Jul 2021 06:47:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627393634; cv=none; d=google.com; s=arc-20160816; b=Iy4T4/wk204Cjj82Mpqp98QoEcIpqrRHsYVhyOKiDvk82MAyTZjXMQfnhLGKt3ijbU CnU+LWw2TZ4PPmBjThtXh+HIQUFVtYGiJOo+hkf5yFkQuyoQj5wFdQPp9/YxsFxyjcEP UtLGmjfq+fZ75D7d2feFu2FaH3gGVphK8NNcBEpDvLVPpXMWUPbJRuwIYWdJbCmxZyop UdeV1AG9gVUf/hZ7COPzHsqmjqnCGfUho55Pbez8BuTZ1mfHdk8VPsXGXVSmuyrezVd0 zuHR1R91goHKvbL+H6Q35FyBQks1qTmVrKQ4gw2rjMwAdEhZxxUCZDuuEJbnVjptOYIb gCdQ== 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=Hoqua3l2UBpOrsfB8YuEfOGyYxMH7w5Lfb2vXq7fQoU=; b=GfeN54Zx+lwgeOAoNCllY6tPOX17NktMQn0dT2gKAZ4UUgBR5c2q5Sv+n9L8rv+K/w qk5unq20gBzAqyKdq3vPhET0mnyBPWtxQnLoS1KQwpSnittJyFdnQvu49X6aJD4jSMEk ZaA2wumftn5DgIEBR8ucdR6WlugJi013nqd2YF1PZOVR+QxJ7VSrF8zKAQz1FAsa0qAT k5WM7YqWo9VScr5Xw6HCOMG/pUZovEt6y3+Y2bw5LMwt+HilYYhlr/evR2GqzuRtcTtE AlPBLF7hUwgmLlJp+bNgrzRem1g2vvatrCeo/LpkU0GHTzJfYSb2B5RD8/wgtK1UUKOh 7Ulw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UVT2dvu9; 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 z21si3152597edd.231.2021.07.27.06.47.14; Tue, 27 Jul 2021 06:47:14 -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=UVT2dvu9; 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 S237364AbhG0NrJ (ORCPT + 8 others); Tue, 27 Jul 2021 09:47:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:47290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237119AbhG0Nqq (ORCPT ); Tue, 27 Jul 2021 09:46:46 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id F227061ACF; Tue, 27 Jul 2021 13:46:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627393598; bh=OcI4JLWx9byD07inpb1StFBsTxVVAV4+ZA6Ud/7IWqc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UVT2dvu9tXOcQI5W1b/Q5YDjC2RcNJUxcs1M55bPMSpnkkEZOSG36fr5zbItOaJjv pPxqDtmZOwIdVf/bJLtqgj7ndZThW9MC0MPcjoORHr89k87Iyd23sl71V3q76RFUgu WUFT9ke9qzK7iCqiOlvMmmxKXWTZekCRG7sOe6cgGQuVzc4b13SGIhPEt14IiR9rTV gkT5UiCxl4/o2j9ap4thAHG3AtUba15YX3mrioCMN34HrWESlKfLsCfkpFUfaEBM4M G2Sh34O0wbicgOR2eGCxX2JDcZnwjyOtREmH7aGM+GFVUuwBbXKubCEFQn4FS+MYvQ 499PkYvm9JCmg== From: Arnd Bergmann To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Jakub Kicinski , "David S. Miller" , Arnd Bergmann Subject: [PATCH net-next v3 22/31] sb1000: use ndo_siocdevprivate Date: Tue, 27 Jul 2021 15:45:08 +0200 Message-Id: <20210727134517.1384504-23-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210727134517.1384504-1-arnd@kernel.org> References: <20210727134517.1384504-1-arnd@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann The private sb1000 ioctl commands all work correctly in compat mode. Change the to ndo_siocdevprivate as a cleanup. Signed-off-by: Arnd Bergmann --- drivers/net/sb1000.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) -- 2.29.2 diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index e88af978f63c..f01c9db01b16 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c @@ -78,7 +78,8 @@ struct sb1000_private { /* prototypes for Linux interface */ extern int sb1000_probe(struct net_device *dev); static int sb1000_open(struct net_device *dev); -static int sb1000_dev_ioctl (struct net_device *dev, struct ifreq *ifr, int cmd); +static int sb1000_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *data, int cmd); static netdev_tx_t sb1000_start_xmit(struct sk_buff *skb, struct net_device *dev); static irqreturn_t sb1000_interrupt(int irq, void *dev_id); @@ -135,7 +136,7 @@ MODULE_DEVICE_TABLE(pnp, sb1000_pnp_ids); static const struct net_device_ops sb1000_netdev_ops = { .ndo_open = sb1000_open, .ndo_start_xmit = sb1000_start_xmit, - .ndo_do_ioctl = sb1000_dev_ioctl, + .ndo_siocdevprivate = sb1000_siocdevprivate, .ndo_stop = sb1000_close, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, @@ -987,7 +988,8 @@ sb1000_open(struct net_device *dev) return 0; /* Always succeed */ } -static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) +static int sb1000_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *data, int cmd) { char* name; unsigned char version[2]; @@ -1011,7 +1013,7 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) stats[2] = dev->stats.rx_packets; stats[3] = dev->stats.rx_errors; stats[4] = dev->stats.rx_dropped; - if(copy_to_user(ifr->ifr_data, stats, sizeof(stats))) + if (copy_to_user(data, stats, sizeof(stats))) return -EFAULT; status = 0; break; @@ -1019,21 +1021,21 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) case SIOCGCMFIRMWARE: /* get firmware version */ if ((status = sb1000_get_firmware_version(ioaddr, name, version, 1))) return status; - if(copy_to_user(ifr->ifr_data, version, sizeof(version))) + if (copy_to_user(data, version, sizeof(version))) return -EFAULT; break; case SIOCGCMFREQUENCY: /* get frequency */ if ((status = sb1000_get_frequency(ioaddr, name, &frequency))) return status; - if(put_user(frequency, (int __user *) ifr->ifr_data)) + if (put_user(frequency, (int __user *)data)) return -EFAULT; break; case SIOCSCMFREQUENCY: /* set frequency */ if (!capable(CAP_NET_ADMIN)) return -EPERM; - if(get_user(frequency, (int __user *) ifr->ifr_data)) + if (get_user(frequency, (int __user *)data)) return -EFAULT; if ((status = sb1000_set_frequency(ioaddr, name, frequency))) return status; @@ -1042,14 +1044,14 @@ static int sb1000_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) case SIOCGCMPIDS: /* get PIDs */ if ((status = sb1000_get_PIDs(ioaddr, name, PID))) return status; - if(copy_to_user(ifr->ifr_data, PID, sizeof(PID))) + if (copy_to_user(data, PID, sizeof(PID))) return -EFAULT; break; case SIOCSCMPIDS: /* set PIDs */ if (!capable(CAP_NET_ADMIN)) return -EPERM; - if(copy_from_user(PID, ifr->ifr_data, sizeof(PID))) + if (copy_from_user(PID, data, sizeof(PID))) return -EFAULT; if ((status = sb1000_set_PIDs(ioaddr, name, PID))) return status;