From: Jason Wang <jasowang@redhat.com>
To: davem@davemloft.net, mst@redhat.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: sergei.shtylyov@cogentembedded.com, Jason Wang <jasowang@redhat.com>
Subject: [net-next rfc V3 7/9] macvtap: allow TUNSETIFF to create multiqueue device
Date: Wed, 5 Jun 2013 14:36:30 +0800 [thread overview]
Message-ID: <1370414192-5830-8-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1370414192-5830-1-git-send-email-jasowang@redhat.com>
Though the queue were in fact created by open(), we still need to add this check
to be compatible with tuntap which can let mgmt software use a single API to
manage queues. This patch only validates the device name and moves the TUNSETIFF
to a helper.
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
drivers/net/macvtap.c | 51 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
index 5ccba99..14764cc 100644
--- a/drivers/net/macvtap.c
+++ b/drivers/net/macvtap.c
@@ -869,6 +869,7 @@ out:
return ret;
}
+
static struct macvlan_dev *macvtap_get_vlan(struct macvtap_queue *q)
{
struct macvlan_dev *vlan;
@@ -887,6 +888,44 @@ static void macvtap_put_vlan(struct macvlan_dev *vlan)
dev_put(vlan->dev);
}
+static int macvtap_set_iff(struct file *file, struct ifreq __user *ifr_u)
+{
+ struct macvtap_queue *q = file->private_data;
+ struct net *net = current->nsproxy->net_ns;
+ struct inode *inode = file_inode(file);
+ struct net_device *dev, *dev2;
+ struct ifreq ifr;
+
+ if (copy_from_user(&ifr, ifr_u, sizeof(struct ifreq)))
+ return -EFAULT;
+
+ /* To keep the same behavior of tuntap, validate ifr_name */
+ if (ifr.ifr_flags & IFF_MULTI_QUEUE) {
+ dev = __dev_get_by_name(net, ifr.ifr_name);
+ if (!dev)
+ return -EINVAL;
+
+ dev2 = dev_get_by_macvtap_minor(iminor(inode));
+ if (!dev2)
+ return -EINVAL;
+
+ if (dev != dev2) {
+ dev_put(dev2);
+ return -EINVAL;
+ }
+
+ dev_put(dev2);
+ }
+
+ if ((ifr.ifr_flags & ~(IFF_VNET_HDR | IFF_MULTI_QUEUE)) !=
+ (IFF_NO_PI | IFF_TAP))
+ return -EINVAL;
+ else
+ q->flags = ifr.ifr_flags;
+
+ return 0;
+}
+
/*
* provide compatibility with generic tun/tap interface
*/
@@ -905,17 +944,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
switch (cmd) {
case TUNSETIFF:
- /* ignore the name, just look at flags */
- if (get_user(u, &ifr->ifr_flags))
- return -EFAULT;
-
- ret = 0;
- if ((u & ~IFF_VNET_HDR) != (IFF_NO_PI | IFF_TAP))
- ret = -EINVAL;
- else
- q->flags = u;
-
- return ret;
+ return macvtap_set_iff(file, ifr);
case TUNGETIFF:
vlan = macvtap_get_vlan(q);
--
1.7.1
next prev parent reply other threads:[~2013-06-05 6:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-05 6:36 [net-next rfc V3 0/9] Multiqueue API for macvtap Jason Wang
2013-06-05 6:36 ` [net-next rfc V3 1/9] macvtap: fix a possible race between queue selection and changing queues Jason Wang
2013-06-05 10:35 ` Michael S. Tsirkin
2013-06-05 6:36 ` [net-next rfc V3 2/9] macvtap: do not add self to waitqueue if doing a nonblock read Jason Wang
2013-06-05 11:07 ` Michael S. Tsirkin
2013-06-05 6:36 ` [net-next rfc V3 3/9] macvlan: switch to use IS_ENABLED() Jason Wang
2013-06-05 6:36 ` [net-next rfc V3 4/9] macvtap: introduce macvtap_get_vlan() Jason Wang
2013-06-05 6:36 ` [net-next rfc V3 5/9] macvlan: change the max number of queues to 16 Jason Wang
2013-06-05 6:36 ` [net-next rfc V3 6/9] macvtap: eliminate linear search Jason Wang
2013-06-05 6:36 ` Jason Wang [this message]
2013-06-05 10:43 ` [net-next rfc V3 7/9] macvtap: allow TUNSETIFF to create multiqueue device Michael S. Tsirkin
2013-06-06 3:13 ` Jason Wang
2013-06-06 6:59 ` Michael S. Tsirkin
2013-06-06 7:12 ` Jason Wang
2013-06-06 7:26 ` Michael S. Tsirkin
2013-06-06 7:31 ` Jason Wang
2013-06-05 6:36 ` [net-next rfc V3 8/9] macvtap: add TUNSETQUEUE ioctl Jason Wang
2013-06-05 10:59 ` Michael S. Tsirkin
2013-06-06 3:16 ` Jason Wang
2013-06-06 7:23 ` Michael S. Tsirkin
2013-06-06 7:30 ` Jason Wang
2013-06-05 6:36 ` [net-next rfc V3 9/9] macvtap: enable multiqueue flag Jason Wang
2013-06-05 10:36 ` [net-next rfc V3 0/9] Multiqueue API for macvtap Michael S. Tsirkin
2013-06-06 3:07 ` Jason Wang
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=1370414192-5830-8-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).