From: Arnd Bergmann <arnd@kernel.org> To: netdev@vger.kernel.org Cc: Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, bridge@lists.linux-foundation.org, linux-hams@vger.kernel.org, Jakub Kicinski <kuba@kernel.org>, Christoph Hellwig <hch@lst.de>, Alexander Viro <viro@zeniv.linux.org.uk>, Johannes Berg <johannes@sipsolutions.net>, Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com> Subject: [RFC net-next 10/28] appletalk: use ndo_siocdevprivate Date: Fri, 6 Nov 2020 23:17:25 +0100 [thread overview] Message-ID: <20201106221743.3271965-11-arnd@kernel.org> (raw) In-Reply-To: <20201106221743.3271965-1-arnd@kernel.org> From: Arnd Bergmann <arnd@arndb.de> appletalk has three SIOCDEVPRIVATE ioctl commands that are broken in compat mode because the passed structure contains a pointer. Change it over to ndo_siocdevprivate for consistency and make it return an error when called in compat mode. This could be fixed if there are still users. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/appletalk/ipddp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index 51cf5eca9c7f..812b1c878ae7 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c @@ -54,11 +54,11 @@ static netdev_tx_t ipddp_xmit(struct sk_buff *skb, static int ipddp_create(struct ipddp_route *new_rt); static int ipddp_delete(struct ipddp_route *rt); static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt); -static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); +static int ipddp_siocdevprivate(struct net_device *dev, struct ifreq *ifr, void __user *data, int cmd); static const struct net_device_ops ipddp_netdev_ops = { .ndo_start_xmit = ipddp_xmit, - .ndo_do_ioctl = ipddp_ioctl, + .ndo_siocdevprivate = ipddp_siocdevprivate, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, }; @@ -268,15 +268,18 @@ static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt) return NULL; } -static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) +static int ipddp_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *data, int cmd) { - struct ipddp_route __user *rt = ifr->ifr_data; struct ipddp_route rcp, rcp2, *rp; + if (in_compat_syscall()) + return -EOPNOTSUPP; + if(!capable(CAP_NET_ADMIN)) return -EPERM; - if(copy_from_user(&rcp, rt, sizeof(rcp))) + if(copy_from_user(&rcp, data, sizeof(rcp))) return -EFAULT; switch(cmd) @@ -296,7 +299,7 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) spin_unlock_bh(&ipddp_route_lock); if (rp) { - if (copy_to_user(rt, &rcp2, + if (copy_to_user(data, &rcp2, sizeof(struct ipddp_route))) return -EFAULT; return 0; -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@kernel.org> To: netdev@vger.kernel.org Cc: Andrew Lunn <andrew@lunn.ch>, Arnd Bergmann <arnd@arndb.de>, bridge@lists.linux-foundation.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Viro <viro@zeniv.linux.org.uk>, Jakub Kicinski <kuba@kernel.org>, linux-hams@vger.kernel.org, Johannes Berg <johannes@sipsolutions.net>, Christoph Hellwig <hch@lst.de>, Heiner Kallweit <hkallweit1@gmail.com> Subject: [Bridge] [RFC net-next 10/28] appletalk: use ndo_siocdevprivate Date: Fri, 6 Nov 2020 23:17:25 +0100 [thread overview] Message-ID: <20201106221743.3271965-11-arnd@kernel.org> (raw) In-Reply-To: <20201106221743.3271965-1-arnd@kernel.org> From: Arnd Bergmann <arnd@arndb.de> appletalk has three SIOCDEVPRIVATE ioctl commands that are broken in compat mode because the passed structure contains a pointer. Change it over to ndo_siocdevprivate for consistency and make it return an error when called in compat mode. This could be fixed if there are still users. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/net/appletalk/ipddp.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index 51cf5eca9c7f..812b1c878ae7 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c @@ -54,11 +54,11 @@ static netdev_tx_t ipddp_xmit(struct sk_buff *skb, static int ipddp_create(struct ipddp_route *new_rt); static int ipddp_delete(struct ipddp_route *rt); static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt); -static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd); +static int ipddp_siocdevprivate(struct net_device *dev, struct ifreq *ifr, void __user *data, int cmd); static const struct net_device_ops ipddp_netdev_ops = { .ndo_start_xmit = ipddp_xmit, - .ndo_do_ioctl = ipddp_ioctl, + .ndo_siocdevprivate = ipddp_siocdevprivate, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, }; @@ -268,15 +268,18 @@ static struct ipddp_route* __ipddp_find_route(struct ipddp_route *rt) return NULL; } -static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) +static int ipddp_siocdevprivate(struct net_device *dev, struct ifreq *ifr, + void __user *data, int cmd) { - struct ipddp_route __user *rt = ifr->ifr_data; struct ipddp_route rcp, rcp2, *rp; + if (in_compat_syscall()) + return -EOPNOTSUPP; + if(!capable(CAP_NET_ADMIN)) return -EPERM; - if(copy_from_user(&rcp, rt, sizeof(rcp))) + if(copy_from_user(&rcp, data, sizeof(rcp))) return -EFAULT; switch(cmd) @@ -296,7 +299,7 @@ static int ipddp_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) spin_unlock_bh(&ipddp_route_lock); if (rp) { - if (copy_to_user(rt, &rcp2, + if (copy_to_user(data, &rcp2, sizeof(struct ipddp_route))) return -EFAULT; return 0; -- 2.27.0
next prev parent reply other threads:[~2020-11-06 22:21 UTC|newest] Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-06 22:17 [RFC net-next 00/28] ndo_ioctl rework Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 01/28] net: split out SIOCDEVPRIVATE handling from dev_ioctl Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 02/28] staging: rtlwifi: use siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 03/28] staging: wlan-ng: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 04/28] hostap: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 05/28] wireless: remove old ioctls Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 06/28] bridge: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 07/28] phonet: use siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 08/28] tulip: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 09/28] bonding: use siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann [this message] 2020-11-06 22:17 ` [Bridge] [RFC net-next 10/28] appletalk: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 11/28] hamachi: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 12/28] tehuti: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 13/28] eql: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 14/28] fddi: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 15/28] net: usb: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 16/28] slip/plip: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 17/28] qeth: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 18/28] cxgb3: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 19/28] dev_ioctl: pass SIOCDEVPRIVATE data separately Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 20/28] dev_ioctl: split out ndo_eth_ioctl Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 21/28] wan: use ndo_siocdevprivate Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 22/28] hamradio: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 23/28] airo: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 24/28] ip_tunnel: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 25/28] hippi: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 26/28] sb1000: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 27/28] ppp: " Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-06 22:17 ` [RFC net-next 28/28] net: socket: return changed ifreq from SIOCDEVPRIVATE Arnd Bergmann 2020-11-06 22:17 ` [Bridge] " Arnd Bergmann 2020-11-08 0:06 ` [RFC net-next 00/28] ndo_ioctl rework Jakub Kicinski 2020-11-08 0:06 ` [Bridge] " Jakub Kicinski 2020-11-08 0:06 ` Jakub Kicinski 2020-11-08 8:27 ` Arnd Bergmann 2020-11-08 8:27 ` [Bridge] " Arnd Bergmann 2020-11-08 11:21 ` Kalle Valo 2020-11-08 11:21 ` [Bridge] " Kalle Valo 2020-11-08 11:42 ` Arnd Bergmann 2020-11-08 11:42 ` [Bridge] " Arnd Bergmann 2020-11-08 11:42 ` Arnd Bergmann 2020-11-09 11:25 ` Kalle Valo 2020-11-09 11:25 ` [Bridge] " Kalle Valo 2020-11-09 11:25 ` Kalle Valo
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=20201106221743.3271965-11-arnd@kernel.org \ --to=arnd@kernel.org \ --cc=andrew@lunn.ch \ --cc=arnd@arndb.de \ --cc=bridge@lists.linux-foundation.org \ --cc=hch@lst.de \ --cc=hkallweit1@gmail.com \ --cc=johannes@sipsolutions.net \ --cc=kuba@kernel.org \ --cc=linux-hams@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-wireless@vger.kernel.org \ --cc=netdev@vger.kernel.org \ --cc=viro@zeniv.linux.org.uk \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.