---

yaml --- r: 376631 b: refs/heads/master c: 8e6d91a h: refs/heads/master i: 376629: 067f906 376627: a851d88 376623: c510750 v: v3
git-mirror · May 29, 2013 · 08f3d5c · 08f3d5c
1 parent 39854ad
commit 08f3d5c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 456db6a4d495f40777da6f1f32f62f13026f52db
+refs/heads/master: 8e6d91ae0917bf934ed86411148f79d904728d51
diff --git a/trunk/drivers/net/tun.c b/trunk/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);