tuntap: forbid changing mq flag for persistent device
diff mbox series

Message ID 1369801931-6856-1-git-send-email-jasowang@redhat.com
State New, archived
Headers show
Series
  • tuntap: forbid changing mq flag for persistent device
Related show

Commit Message

Jason Wang May 29, 2013, 4:32 a.m. UTC
We currently allow changing the mq flag (IFF_MULTI_QUEUE) for a persistent
device. This will result a mismatch between the number the queues in netdev and
tuntap. This is because we only allocate a 1q netdevice when IFF_MULTI_QUEUE was
not specified, so when we set the IFF_MULTI_QUEUE and try to attach more queues
later, netif_set_real_num_tx_queues() may fail which result a single queue
netdevice with multiple sockets attached.

Solve this by disallowing changing the mq flag for persistent device.

Bug was introduced by commit edfb6a148ce62e5e19354a1dcd9a34e00815c2a1
(tuntap: reduce memory using of queues).

Reported-by: Sriram Narasimhan <sriram.narasimhan@hp.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 drivers/net/tun.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Comments

David Miller May 29, 2013, 7:22 a.m. UTC | #1
From: Jason Wang <jasowang@redhat.com>
Date: Wed, 29 May 2013 12:32:11 +0800

> We currently allow changing the mq flag (IFF_MULTI_QUEUE) for a persistent
> device. This will result a mismatch between the number the queues in netdev and
> tuntap. This is because we only allocate a 1q netdevice when IFF_MULTI_QUEUE was
> not specified, so when we set the IFF_MULTI_QUEUE and try to attach more queues
> later, netif_set_real_num_tx_queues() may fail which result a single queue
> netdevice with multiple sockets attached.
> 
> Solve this by disallowing changing the mq flag for persistent device.
> 
> Bug was introduced by commit edfb6a148ce62e5e19354a1dcd9a34e00815c2a1
> (tuntap: reduce memory using of queues).
> 
> Reported-by: Sriram Narasimhan <sriram.narasimhan@hp.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>

Applied, thanks Jason.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Patch
diff mbox series

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index f042b03..89776c5 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -1585,6 +1585,10 @@  static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 		else
 			return -EINVAL;
 
+		if (!!(ifr->ifr_flags & IFF_MULTI_QUEUE) !=
+		    !!(tun->flags & TUN_TAP_MQ))
+			return -EINVAL;
+
 		if (tun_not_capable(tun))
 			return -EPERM;
 		err = security_tun_dev_open(tun->security);