]> Pileus Git - ~andy/linux/commitdiff
tun: avoid owner checks on IFF_ATTACH_QUEUE
authorMichael S. Tsirkin <mst@redhat.com>
Thu, 10 Jan 2013 01:31:08 +0000 (01:31 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 10 Jan 2013 22:26:43 +0000 (14:26 -0800)
At the moment, we check owner when we enable queue in tun.
This seems redundant and will break some valid uses
where fd is passed around: I think TUNSETOWNER is there
to prevent others from attaching to a persistent device not
owned by them. Here the fd is already attached,
enabling/disabling queue is more like read/write.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tun.c

index cf6da6efc71a6284a212594a8d7513817c503cc4..99b58d86217474d1b537d4e9976acf3d6c1d697e 100644 (file)
@@ -1791,8 +1791,6 @@ static int tun_set_queue(struct file *file, struct ifreq *ifr)
                tun = tfile->detached;
                if (!tun)
                        ret = -EINVAL;
-               else if (tun_not_capable(tun))
-                       ret = -EPERM;
                else
                        ret = tun_attach(tun, file);
        } else if (ifr->ifr_flags & IFF_DETACH_QUEUE) {