Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@kernel.org>
To: netdev@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH net-next v2 16/31] qeth: use ndo_siocdevprivate
Date: Tue, 20 Jul 2021 16:46:23 +0200	[thread overview]
Message-ID: <20210720144638.2859828-17-arnd@kernel.org> (raw)
In-Reply-To: <20210720144638.2859828-1-arnd@kernel.org>

From: Arnd Bergmann <arnd@arndb.de>

qeth has both standard MII ioctls and custom SIOCDEVPRIVATE ones,
all of which work correctly with compat user space.

Move the private ones over to the new ndo_siocdevprivate callback.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/s390/net/qeth_core.h      |  5 ++++-
 drivers/s390/net/qeth_core_main.c | 35 ++++++++++++++++++++++---------
 drivers/s390/net/qeth_l3_main.c   |  6 +++---
 3 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index f4d554ea0c93..89fd7432dbec 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -790,7 +790,8 @@ struct qeth_discipline {
 	void (*remove) (struct ccwgroup_device *);
 	int (*set_online)(struct qeth_card *card, bool carrier_ok);
 	void (*set_offline)(struct qeth_card *card);
-	int (*do_ioctl)(struct net_device *dev, struct ifreq *rq, int cmd);
+	int (*do_ioctl)(struct net_device *dev, struct ifreq *rq,
+			void __user *data, int cmd);
 	int (*control_event_handler)(struct qeth_card *card,
 					struct qeth_ipa_cmd *cmd);
 };
@@ -1124,6 +1125,8 @@ int qeth_do_send_packet(struct qeth_card *card, struct qeth_qdio_out_q *queue,
 			unsigned int offset, unsigned int hd_len,
 			int elements_needed);
 int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
+int qeth_siocdevprivate(struct net_device *dev, struct ifreq *rq,
+			void __user *data, int cmd);
 void qeth_dbf_longtext(debug_info_t *id, int level, char *text, ...);
 int qeth_configure_cq(struct qeth_card *, enum qeth_cq);
 int qeth_hw_trap(struct qeth_card *, enum qeth_diags_trap_action);
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 62f88ccbd03f..be19cfd05136 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -6672,21 +6672,42 @@ struct qeth_card *qeth_get_card_by_busid(char *bus_id)
 }
 EXPORT_SYMBOL_GPL(qeth_get_card_by_busid);
 
-int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+int qeth_siocdevprivate(struct net_device *dev, struct ifreq *rq, void __user *data, int cmd)
 {
 	struct qeth_card *card = dev->ml_priv;
-	struct mii_ioctl_data *mii_data;
 	int rc = 0;
 
 	switch (cmd) {
 	case SIOC_QETH_ADP_SET_SNMP_CONTROL:
-		rc = qeth_snmp_command(card, rq->ifr_ifru.ifru_data);
+		rc = qeth_snmp_command(card, data);
 		break;
 	case SIOC_QETH_GET_CARD_TYPE:
 		if ((IS_OSD(card) || IS_OSM(card) || IS_OSX(card)) &&
 		    !IS_VM_NIC(card))
 			return 1;
 		return 0;
+	case SIOC_QETH_QUERY_OAT:
+		rc = qeth_query_oat_command(card, data);
+		break;
+	default:
+		if (card->discipline->do_ioctl)
+			rc = card->discipline->do_ioctl(dev, rq, data, cmd);
+		else
+			rc = -EOPNOTSUPP;
+	}
+	if (rc)
+		QETH_CARD_TEXT_(card, 2, "ioce%x", rc);
+	return rc;
+}
+EXPORT_SYMBOL_GPL(qeth_siocdevprivate);
+
+int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+{
+	struct qeth_card *card = dev->ml_priv;
+	struct mii_ioctl_data *mii_data;
+	int rc = 0;
+
+	switch (cmd) {
 	case SIOCGMIIPHY:
 		mii_data = if_mii(rq);
 		mii_data->phy_id = 0;
@@ -6699,14 +6720,8 @@ int qeth_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 			mii_data->val_out = qeth_mdio_read(dev,
 				mii_data->phy_id, mii_data->reg_num);
 		break;
-	case SIOC_QETH_QUERY_OAT:
-		rc = qeth_query_oat_command(card, rq->ifr_ifru.ifru_data);
-		break;
 	default:
-		if (card->discipline->do_ioctl)
-			rc = card->discipline->do_ioctl(dev, rq, cmd);
-		else
-			rc = -EOPNOTSUPP;
+		return -EOPNOTSUPP;
 	}
 	if (rc)
 		QETH_CARD_TEXT_(card, 2, "ioce%x", rc);
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index f0d6f205c53c..71778b6076bd 100644
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -1512,7 +1512,7 @@ static int qeth_l3_arp_flush_cache(struct qeth_card *card)
 	return rc;
 }
 
-static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
+static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, void __user *data, int cmd)
 {
 	struct qeth_card *card = dev->ml_priv;
 	struct qeth_arp_cache_entry arp_entry;
@@ -1532,13 +1532,13 @@ static int qeth_l3_do_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 			rc = -EPERM;
 			break;
 		}
-		rc = qeth_l3_arp_query(card, rq->ifr_ifru.ifru_data);
+		rc = qeth_l3_arp_query(card, data);
 		break;
 	case SIOC_QETH_ARP_ADD_ENTRY:
 	case SIOC_QETH_ARP_REMOVE_ENTRY:
 		if (!capable(CAP_NET_ADMIN))
 			return -EPERM;
-		if (copy_from_user(&arp_entry, rq->ifr_data, sizeof(arp_entry)))
+		if (copy_from_user(&arp_entry, data, sizeof(arp_entry)))
 			return -EFAULT;
 
 		arp_cmd = (cmd == SIOC_QETH_ARP_ADD_ENTRY) ?
-- 
2.29.2


  parent reply	other threads:[~2021-07-20 15:23 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-20 14:46 [PATCH net-next v2 00/31] ndo_ioctl rework Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 01/31] net: split out SIOCDEVPRIVATE handling from dev_ioctl Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 02/31] staging: rtlwifi: use siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 03/31] staging: wlan-ng: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 04/31] hostap: use ndo_siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 05/31] bridge: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 06/31] phonet: use siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 07/31] tulip: use ndo_siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 08/31] bonding: use siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 09/31] appletalk: use ndo_siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 10/31] hamachi: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 11/31] tehuti: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 12/31] eql: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 13/31] fddi: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 14/31] net: usb: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 15/31] slip/plip: " Arnd Bergmann
2021-07-20 14:46 ` Arnd Bergmann [this message]
2021-07-21  6:05   ` [PATCH net-next v2 16/31] qeth: " Julian Wiedmann
2021-07-21  8:49     ` Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 17/31] cxgb3: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 18/31] hamradio: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 19/31] airo: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 20/31] ip_tunnel: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 21/31] hippi: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 22/31] sb1000: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 23/31] ppp: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 24/31] wan: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 25/31] wan: cosa: remove dead cosa_net_ioctl() function Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 26/31] dev_ioctl: pass SIOCDEVPRIVATE data separately Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 27/31] dev_ioctl: split out ndo_eth_ioctl Arnd Bergmann
2021-07-21 16:21   ` Shannon Nelson
2021-07-20 14:46 ` [PATCH net-next v2 28/31] net: split out ndo_siowandev ioctl Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 29/31] net: socket: return changed ifreq from SIOCDEVPRIVATE Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 30/31] net: bridge: move bridge ioctls out of .ndo_do_ioctl Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 31/31] net: bonding: move ioctl handling to private ndo operation Arnd Bergmann
2021-07-20 19:08 ` [PATCH net-next v2 00/31] ndo_ioctl rework David Miller
2021-07-22 15:02   ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210720144638.2859828-17-arnd@kernel.org \
    --to=arnd@kernel.org \
    --cc=arnd@arndb.de \
    --cc=hch@lst.de \
    --cc=netdev@vger.kernel.org \
    --subject='Re: [PATCH net-next v2 16/31] qeth: use ndo_siocdevprivate' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).