]> git.baikalelectronics.ru Git - kernel.git/commitdiff
tun: allow positive return values on dev_get_valid_name() call
authorJulien Gomes <julien@arista.com>
Wed, 25 Oct 2017 18:50:50 +0000 (11:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 26 Oct 2017 01:10:03 +0000 (10:10 +0900)
If the name argument of dev_get_valid_name() contains "%d", it will try
to assign it a unit number in __dev__alloc_name() and return either the
unit number (>= 0) or an error code (< 0).
Considering positive values as error values prevent tun device creations
relying this mechanism, therefor we should only consider negative values
as errors here.

Signed-off-by: Julien Gomes <julien@arista.com>
Acked-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/tun.c

index e21bf90b819f8f77e4886a6d1ff7c7b5ca12bad0..b9973fb868b79d5df8cea35780a4575703e70a53 100644 (file)
@@ -2028,7 +2028,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr)
                if (!dev)
                        return -ENOMEM;
                err = dev_get_valid_name(net, dev, name);
-               if (err)
+               if (err < 0)
                        goto err_free_dev;
 
                dev_net_set(dev, net);