From patchwork Fri Nov 6 22:17:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 320875 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp1674833ilc; Fri, 6 Nov 2020 14:19:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIcFoVuIxwKXNwUMQ2JGkIZpG3ajbvTXkv4UOWbMNksVh/f/qpDjX0aVPPL/8H0kqcGogI X-Received: by 2002:a17:906:dbd1:: with SMTP id yc17mr636437ejb.105.1604701154508; Fri, 06 Nov 2020 14:19:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604701154; cv=none; d=google.com; s=arc-20160816; b=UFweI3pe7KCs0X8vwIqW+P4VRxe9+50IZdwdFk6RQTVpxJ8haIfxgUHzfuM8/g5Gip x11p7zyXXN0sH/KDGD3v1J12K9eOzHtyjCEjkYHoBWApQZ3y74+UC+hSsgK5D/RLxvdh 6gDsUBQ1mvYWT6LMHA7OkE+WgCnC23eh5iA/SkS+yZ3hfUqpqoescm+GNmxiNLyVW2XU OZWOd5iPkd6KLkNtDGML7Gd6tFLkTZEv1eL2cRgHLevt/3bI25MZL8jGGYExxg3x8hsB d1RT3oLobTSW9D/myLA6RqNUcm+r0cqasObICVLw6zuDBK/ZRxR9ANhWfGL8D8ltb9Vg 87Zw== 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=MdO+yiVoe/usCJMNwvUjB7xEfJOZ8mEl1/S4ujuve20=; b=k++vxe+JQ8Jry9lXR28l1b45TwGgbwu9SFWsMvEOTC4EPUwZ6YL2f7TJIzH/tqloOO wIrYsD9HUj6atCY1XPiYFMoBrYoLi4o115CPtrHbrT68iyJyUpqtVxFd/rXfXKBjPd1I SjytNwcSfLnaKCBq5ffu7PYm2N6KGGU/MTov0CB8dSeoPhwP3dVskUwFJzX+L0JZOI/c /MD94lCqhydTQq/S9Nq0SGkezyOvT7i3MP6QKM5E4kX/Hljhy1vs3WYKrRGLoydwrraP 4RrA9MjUkxAt2xbPWQSrWtwHG0scVDYR9NePJXtogZ16njTG2WHy7uS7brh4Vczqt2Ki p89g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dRtd5q1i; 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 k12si1809018ejd.562.2020.11.06.14.19.14; Fri, 06 Nov 2020 14:19:14 -0800 (PST) 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=default header.b=dRtd5q1i; 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 S1729224AbgKFWTL (ORCPT + 8 others); Fri, 6 Nov 2020 17:19:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:42694 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729198AbgKFWTK (ORCPT ); Fri, 6 Nov 2020 17:19:10 -0500 Received: from localhost.localdomain (HSI-KBW-46-223-126-90.hsi.kabel-badenwuerttemberg.de [46.223.126.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7C64F22203; Fri, 6 Nov 2020 22:19:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604701148; bh=pEjO8MOIRZIJ7Ooiru/CipOAPrgkHN/unK+fIxgV7T0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dRtd5q1iL4QqZGn3xToh9+nA8yInKonADzu22FwHKwMf7SgG/l4MRxe5OVhPDXH33 EIJJrFiBhB8Ax7YONIBF6yaX9ZLbUZTLYg5xjtv33W/Pz+jMLZzbck6NsF9OIpIH5e JyVaEvLkDAn7MPbmbxnyQ9w5KkXmSN8v9DvbPWvQ= From: Arnd Bergmann To: netdev@vger.kernel.org Cc: Arnd Bergmann , linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, bridge@lists.linux-foundation.org, linux-hams@vger.kernel.org, Jakub Kicinski , Christoph Hellwig , Alexander Viro , Johannes Berg , Andrew Lunn , Heiner Kallweit Subject: [RFC net-next 26/28] sb1000: use ndo_siocdevprivate Date: Fri, 6 Nov 2020 23:17:41 +0100 Message-Id: <20201106221743.3271965-27-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201106221743.3271965-1-arnd@kernel.org> References: <20201106221743.3271965-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.27.0 diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index e88af978f63c..9b14087be900 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;