diff options
| author | Eric Dumazet <edumazet@google.com> | 2018-04-05 06:39:30 -0700 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-03 18:56:09 +0200 |
| commit | db43a7f452ff14bb4371717dc24947692094d2a7 (patch) | |
| tree | 2e93c493e1b00932c51eea15cbf3deb7b8ef59e8 /net | |
| parent | baa0f0c89c401a4e1d1a24edd2f465eb7ac258a6 (diff) | |
ip6_tunnel: better validate user provided tunnel names
commit db7a65e3ab78e5b1c4b17c0870ebee35a4ee3257 upstream.
Use valid_name() to make sure user does not provide illegal
device name.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Change-Id: Iedcfa72cb4e7a3ab910fbcdc33fd4b3e1f007aac
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[bwh: Backported to 3.16:
- Don't touch err as ip6_tnl_create() does not return an error code
- Adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 2f03ffd28..04ac8a1e9 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -309,11 +309,13 @@ static struct ip6_tnl *ip6_tnl_create(struct net *net, struct __ip6_tnl_parm *p) char name[IFNAMSIZ]; int err; - if (p->name[0]) + if (p->name[0]) { + if (!dev_valid_name(p->name)) + goto failed; strlcpy(name, p->name, IFNAMSIZ); - else + } else { sprintf(name, "ip6tnl%%d"); - + } dev = alloc_netdev(sizeof (*t), name, ip6_tnl_dev_setup); if (dev == NULL) goto failed; |