From patchwork Tue Jul 20 14:46:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 481542 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5238337jao; Tue, 20 Jul 2021 08:28:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHKO1kEA0XzrBXuk0BeULfMtvUdEmUmSIRATd78tew0YIEYrnSVAGiLWmeXy3IL4e2kAtq X-Received: by 2002:a05:6602:24d8:: with SMTP id h24mr23283907ioe.27.1626794901421; Tue, 20 Jul 2021 08:28:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626794901; cv=none; d=google.com; s=arc-20160816; b=shLTWxFmF+/ehhxdzWNRPZTo/YJN75+SMmAKk4MKDKSbkkaApc4GsQ37v0x2zVInce aNWLMyAFQwV5aXZgMyNzgKL2YxWQC9W+mUEhzyut3UL2sTzZJCv0wsfi7S/j4+jLJdkf nLV2mO9WQO4UvI28M+yzihC2fmJ8kvF3tFg1L6g9OOyLSBj33JIKOmStuaRTSdFmKEJE CD4C+7GtYdfXTAs8lkZ71UsTjI4oaZ0qomZkk5fcLMS4bthBKPpw/ZKNpPaAzsOsLfp0 xhMy445V/Qj0TK6VIClKV80aGHPL05fUjWtUu54zyt0hcUmcFpY1r2VdgNL6sGwHkdgv XiXw== 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=1gv2ztkQAMq5eejEGj6I+MQlIjEAUYLXne5zHLDfcDI=; b=wrKjM8KLN4tZsPEIXffFG9QEpHXXY25duiKCElAgoijPHp/MoiigMOKPp+J65dd82C kdI2lgOFkNUQPYYxHODSp/sTQQ5MKY4gszx/+7GbRIz+JZQEdjj1B4Jx5JS2WcM9zaS6 xS21YvsWFgCb9R7L6YZRQrFjDcwsXJMMQjhhewJk4L29dkaP44hC3KEbS4RwDkA5UK+2 chyxiGaS03ol+1dlvczG7Gr4ejCqCulEIsWEvFEXWOZnY8JcJLjXzrBKtC7QhLIpNGg7 t0qzPWAJk/XU1CJKvUyAggPY3UcN8y/+paEmyuJ4ddUsZ0Xs1Cc5YeGi4zPUYULpordp nJIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GZlTjLNT; 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.28.21; Tue, 20 Jul 2021 08:28:21 -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=GZlTjLNT; 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 S241272AbhGTOq2 (ORCPT + 8 others); Tue, 20 Jul 2021 10:46:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:57360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239449AbhGTOUs (ORCPT ); Tue, 20 Jul 2021 10:20:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 5A8506127C; Tue, 20 Jul 2021 14:47:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626792437; bh=LEeHDn5pJTlaV0kahqlHrD4Pz66OvoOQuTX9MYb53Oo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GZlTjLNTc5gRbQY1VywAKDMrKJe7emFHon7D2NATYg/1MQR/eJ86Dbr1b0X5DXjKb JHgjuLmjEnzspshd+b7TTRriAtTTYPMFqx/dzj4mu47TmxQzBKeltfhzOKH9u8bBeQ d5z5j6ZxRJRcAspeugSlXNtdXTTPgZ3MKH7MFqXEruVEiy44HenW3nvAu5AmC7kYP9 6vKKOSFGqJ01peNC20SrT75XnHWA088qp2cvOfQpN/t4nepl2yuX6GKWQraFs+bC7S rl6qo1jLlrbXCyn1OVvZfUsNGhPEELrZA9kxEpbo9xTJk+veuRHqyd0LrjnQ6fwDvC JhYfEyU4VZAZg== From: Arnd Bergmann To: netdev@vger.kernel.org Cc: Christoph Hellwig , Arnd Bergmann Subject: [PATCH net-next v2 21/31] hippi: use ndo_siocdevprivate Date: Tue, 20 Jul 2021 16:46:28 +0200 Message-Id: <20210720144638.2859828-22-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 The rr_ioctl uses private ioctl commands that correctly pass all data through ifr_data, which works fine in compat mode. Change it to use ndo_siocdevprivate as a cleanup. Signed-off-by: Arnd Bergmann --- drivers/net/hippi/rrunner.c | 11 ++++++----- drivers/net/hippi/rrunner.h | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) -- 2.29.2 diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c index 22010384c4a3..7661dbb31162 100644 --- a/drivers/net/hippi/rrunner.c +++ b/drivers/net/hippi/rrunner.c @@ -63,7 +63,7 @@ static const char version[] = static const struct net_device_ops rr_netdev_ops = { .ndo_open = rr_open, .ndo_stop = rr_close, - .ndo_do_ioctl = rr_ioctl, + .ndo_siocdevprivate = rr_siocdevprivate, .ndo_start_xmit = rr_start_xmit, .ndo_set_mac_address = hippi_mac_addr, }; @@ -1568,7 +1568,8 @@ static int rr_load_firmware(struct net_device *dev) } -static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +static int rr_siocdevprivate(struct net_device *dev, struct ifreq *rq, + void __user *data, int cmd) { struct rr_private *rrpriv; unsigned char *image, *oldimage; @@ -1603,7 +1604,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) error = -EFAULT; goto gf_out; } - error = copy_to_user(rq->ifr_data, image, EEPROM_BYTES); + error = copy_to_user(data, image, EEPROM_BYTES); if (error) error = -EFAULT; gf_out: @@ -1615,7 +1616,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) return -EPERM; } - image = memdup_user(rq->ifr_data, EEPROM_BYTES); + image = memdup_user(data, EEPROM_BYTES); if (IS_ERR(image)) return PTR_ERR(image); @@ -1658,7 +1659,7 @@ static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) return error; case SIOCRRID: - return put_user(0x52523032, (int __user *)rq->ifr_data); + return put_user(0x52523032, (int __user *)data); default: return error; } diff --git a/drivers/net/hippi/rrunner.h b/drivers/net/hippi/rrunner.h index 87533784604f..55377614e752 100644 --- a/drivers/net/hippi/rrunner.h +++ b/drivers/net/hippi/rrunner.h @@ -835,7 +835,8 @@ static int rr_open(struct net_device *dev); static netdev_tx_t rr_start_xmit(struct sk_buff *skb, struct net_device *dev); static int rr_close(struct net_device *dev); -static int rr_ioctl(struct net_device *dev, struct ifreq *rq, int cmd); +static int rr_siocdevprivate(struct net_device *dev, struct ifreq *rq, + void __user *data, int cmd); static unsigned int rr_read_eeprom(struct rr_private *rrpriv, unsigned long offset, unsigned char *buf,