mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
ip6_tunnel: better validate user provided tunnel names
[ Upstream commitdb7a65e3ab
] Use valid_name() to make sure user does not provide illegal device name. Fixes:1da177e4c3
("Linux-2.6.12-rc2") Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
72363c63b0
commit
109dce20c6
1 changed files with 7 additions and 4 deletions
|
@ -297,13 +297,16 @@ static struct ip6_tnl *ip6_tnl_create(struct net *net, struct __ip6_tnl_parm *p)
|
||||||
struct net_device *dev;
|
struct net_device *dev;
|
||||||
struct ip6_tnl *t;
|
struct ip6_tnl *t;
|
||||||
char name[IFNAMSIZ];
|
char name[IFNAMSIZ];
|
||||||
int err = -ENOMEM;
|
int err = -E2BIG;
|
||||||
|
|
||||||
if (p->name[0])
|
if (p->name[0]) {
|
||||||
|
if (!dev_valid_name(p->name))
|
||||||
|
goto failed;
|
||||||
strlcpy(name, p->name, IFNAMSIZ);
|
strlcpy(name, p->name, IFNAMSIZ);
|
||||||
else
|
} else {
|
||||||
sprintf(name, "ip6tnl%%d");
|
sprintf(name, "ip6tnl%%d");
|
||||||
|
}
|
||||||
|
err = -ENOMEM;
|
||||||
dev = alloc_netdev(sizeof(*t), name, NET_NAME_UNKNOWN,
|
dev = alloc_netdev(sizeof(*t), name, NET_NAME_UNKNOWN,
|
||||||
ip6_tnl_dev_setup);
|
ip6_tnl_dev_setup);
|
||||||
if (!dev)
|
if (!dev)
|
||||||
|
|
Loading…
Reference in a new issue