From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Dumazet Subject: [PATCH net 5/6] ip6_tunnel: better validate user provided tunnel names Date: Thu, 5 Apr 2018 06:39:30 -0700 Message-ID: <20180405133931.207634-6-edumazet@google.com> References: <20180405133931.207634-1-edumazet@google.com> Cc: netdev , Steffen Klassert , Eric Dumazet , Eric Dumazet To: "David S . Miller" Return-path: Received: from mail-pl0-f66.google.com ([209.85.160.66]:33937 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751165AbeDENjv (ORCPT ); Thu, 5 Apr 2018 09:39:51 -0400 Received: by mail-pl0-f66.google.com with SMTP id z5-v6so969436pln.1 for ; Thu, 05 Apr 2018 06:39:51 -0700 (PDT) In-Reply-To: <20180405133931.207634-1-edumazet@google.com> Sender: netdev-owner@vger.kernel.org List-ID: Use valid_name() to make sure user does not provide illegal device name. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Eric Dumazet --- net/ipv6/ip6_tunnel.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index df4c29f7d59f030729b1158b809a10f4115d4bbf..da66aaac51cecbf933827c8842e61a8cbb4d274f 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -297,13 +297,16 @@ static struct ip6_tnl *ip6_tnl_create(struct net *net, struct __ip6_tnl_parm *p) struct net_device *dev; struct ip6_tnl *t; 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); - else + } else { sprintf(name, "ip6tnl%%d"); - + } + err = -ENOMEM; dev = alloc_netdev(sizeof(*t), name, NET_NAME_UNKNOWN, ip6_tnl_dev_setup); if (!dev) -- 2.17.0.484.g0c8726318c-goog