diff options
author | Julien Gomes <julien@arista.com> | 2017-10-25 11:50:50 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-18 11:06:31 +0100 |
commit | 0e14c46808100ab64d3c935de776afb0ed7f0550 (patch) | |
tree | 81018460855694d8d5a852e3f90ee32ade1f2898 /drivers | |
parent | 5c39875a93d64fc2a3581b93e1db77dc25ca67b0 (diff) | |
download | linux-stable-0e14c46808100ab64d3c935de776afb0ed7f0550.tar.gz linux-stable-0e14c46808100ab64d3c935de776afb0ed7f0550.tar.bz2 linux-stable-0e14c46808100ab64d3c935de776afb0ed7f0550.zip |
tun: allow positive return values on dev_get_valid_name() call
[ Upstream commit 5c25f65fd1e42685f7ccd80e0621829c105785d9 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
-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 cd6b6d3fd4e2..3067f840210e 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1657,7 +1657,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); |