From 9097cb74995a3de9b14a0548c5e962ca72a824d0 Mon Sep 17 00:00:00 2001 From: Jason Wang Date: Fri, 11 Jan 2013 16:59:33 +0000 Subject: [PATCH] --- yaml --- r: 348631 b: refs/heads/master c: 7c0c3b1a8a175437991ccc898ed66ec5e4a96208 h: refs/heads/master i: 348629: 634a0006781b92b4dea9b94096f971dd03c4528f 348627: c9cdb0d5b84b9d462de7b6b729ae9de4f014dfe6 348623: 9210a0c015fca7a752fc64ba9925d2ce61218a5b v: v3 --- [refs] | 2 +- trunk/drivers/net/tun.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3dc797681e90..8840b80c74ab 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8deabd3eebaa96cf8d6e290d67b03f36c7f7a41 +refs/heads/master: 7c0c3b1a8a175437991ccc898ed66ec5e4a96208 diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c index aa963c44450a..a36b56f0940b 100644 --- a/trunk/drivers/net/tun.c +++ b/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)