diff options
author | Julien Gomes <julien@arista.com> | 2017-10-25 14:50:50 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-10-25 21:10:03 -0400 |
commit | 5c25f65fd1e42685f7ccd80e0621829c105785d9 (patch) | |
tree | 1d8fdcdcfd73a05f73cd37ec1a32ca2e11a23595 | |
parent | d309ae5c6a00648198d1932e6db483d612c2e260 (diff) |
tun: allow positive return values on dev_get_valid_name() call
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>
-rw-r--r-- | drivers/net/tun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index e21bf90b819f..b9973fb868b7 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c | |||
@@ -2028,7 +2028,7 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) | |||
2028 | if (!dev) | 2028 | if (!dev) |
2029 | return -ENOMEM; | 2029 | return -ENOMEM; |
2030 | err = dev_get_valid_name(net, dev, name); | 2030 | err = dev_get_valid_name(net, dev, name); |
2031 | if (err) | 2031 | if (err < 0) |
2032 | goto err_free_dev; | 2032 | goto err_free_dev; |
2033 | 2033 | ||
2034 | dev_net_set(dev, net); | 2034 | dev_net_set(dev, net); |