---

yaml
---
r: 348631
b: refs/heads/master
c: 7c0c3b1
h: refs/heads/master
i:
  348629: 634a000
  348627: c9cdb0d
  348623: 9210a0c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8deabd3eebaa96cf8d6e290d67b03f36c7f7a41
+refs/heads/master: 7c0c3b1a8a175437991ccc898ed66ec5e4a96208

trunk/drivers/net/tun.c

@@ -488,8 +488,6 @@ static int tun_attach(struct tun_struct *tun, struct file *file)
 	err = -EINVAL;
 	if (rtnl_dereference(tfile->tun))
 		goto out;
-	if (tfile->detached && tun != tfile->detached)
-		goto out;
 
 	err = -EBUSY;
 	if (!(tun->flags & TUN_TAP_MQ) && tun->numqueues == 1)
@@ -1543,6 +1541,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
 	struct net_device *dev;
 	int err;
 
+	if (tfile->detached)
+		return -EINVAL;
+
 	dev = __dev_get_by_name(net, ifr->ifr_name);
 	if (dev) {
 		if (ifr->ifr_flags & IFF_TUN_EXCL)