tuntap: forbid changing mq flag for persistent device
Subsystems (3)
PATCH 1/1 tuntap: forbid changing mq flag for persistent device
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).
--- drivers/net/tun.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/net/tun.c +4 -0
@@ -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);
Signature · 1 line
1.7.1
From: Jason Wang <[email protected]>
Date: Wed, 29 May 2013 12:32:11 +0800
Quoted 7 lines
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 whenIFF_MULTI_QUEUEwas not specified, so when we set theIFF_MULTI_QUEUEand try to attach more queues later,netif_set_real_num_tx_queues()may fail which result a single queue netdevice with multiple sockets attached.
Quoted 8 lines
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 <[email protected]>Cc Michael S. Tsirkin <[email protected]>Signed-off-by Jason Wang <[email protected]>
Applied, thanks Jason.