Received: by 10.192.165.156 with SMTP id m28csp1087310imm; Wed, 11 Apr 2018 12:09:57 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+ItiTKlKDGOauKUDBKC0oBoglr4hNWXcAEwcAcOAdJCqrEGEWuAfseAJc2oC8XriZVkrZp X-Received: by 2002:a17:902:bf05:: with SMTP id bi5-v6mr4767454plb.235.1523473797616; Wed, 11 Apr 2018 12:09:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523473797; cv=none; d=google.com; s=arc-20160816; b=EFNIpCGkFqHgjmhuqQ4yyohTEr6b49ryn0VP2Vtb3E95l9Vw7q+qrx/ZLqX30m2OBr MVXZgsw5d+Y77VTB/LIZ+P3ctPAr9iWS7U6GOTtT3rC3qINy1hkpPJ06CF6wF1Z+2FnP m2TAy3aaxNrwsvflK+EOpcdt7SI5H5KnKU9o/qJxB+oqs8mucOkqCK2v2zC9W8qxEb7s mDMx3JyhjKiooeLF3VMpeCN5uK8yXfQNgaNntleM0ESkboNuBA5KakADEZafQSEQGHmx GHzOWnJly2LiPQ0NdcYG8H01QKCHiGhkdw/LDJGOPCc3l9egBr5bXsnXzrDF8NMViDhv +B3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=5ZNE6B1pelN/Eh04ocHn1hhF30yQmaRwfYszxY1MD1I=; b=JQ3oScGC9gU23l6IYUkOqiBY8cUik5I+UkKNEwb9TNpzNaHsdiWMGHxr10WmhP1aKk u1NiErGhqIbHp6+UUZ5PT6kxEHBUv+BHb9TGNp0+5lIxgF4o3/ZsOepOkXwZwqlwquxl P4p9DTN1KmsMvJzsXDayIsCFJLHPBpS+UDR929og58dsPZjJNfcz44gLDyD8sm8JEvjt gZusuFla9aVNDuqi41fpKWVhoDBbqIcq6C8yF13FzmYPd2OlEPF6b6+tVwVV/Rq0b5MZ vrZXVkvwcfMHNz7chMZR135z7JX3IyaOzQsWmf0ivvbmxmuXBO8udqDcSEFtzdLytseZ dYOg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d70si1308612pfl.219.2018.04.11.12.09.20; Wed, 11 Apr 2018 12:09:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935152AbeDKTGH (ORCPT + 99 others); Wed, 11 Apr 2018 15:06:07 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40680 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934041AbeDKTGD (ORCPT ); Wed, 11 Apr 2018 15:06:03 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 2C41FBAC; Wed, 11 Apr 2018 19:06:03 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , syzbot , "David S. Miller" Subject: [PATCH 4.9 294/310] ip_tunnel: better validate user provided tunnel names Date: Wed, 11 Apr 2018 20:37:13 +0200 Message-Id: <20180411183635.233621301@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 9cb726a212a82c88c98aa9f0037fd04777cd8fe5 ] Use dev_valid_name() to make sure user does not provide illegal device name. syzbot caught the following bug : BUG: KASAN: stack-out-of-bounds in strlcpy include/linux/string.h:300 [inline] BUG: KASAN: stack-out-of-bounds in __ip_tunnel_create+0xca/0x6b0 net/ipv4/ip_tunnel.c:257 Write of size 20 at addr ffff8801ac79f810 by task syzkaller268107/4482 CPU: 0 PID: 4482 Comm: syzkaller268107 Not tainted 4.16.0+ #1 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:17 [inline] dump_stack+0x1b9/0x29f lib/dump_stack.c:53 print_address_description+0x6c/0x20b mm/kasan/report.c:256 kasan_report_error mm/kasan/report.c:354 [inline] kasan_report.cold.7+0xac/0x2f5 mm/kasan/report.c:412 check_memory_region_inline mm/kasan/kasan.c:260 [inline] check_memory_region+0x13e/0x1b0 mm/kasan/kasan.c:267 memcpy+0x37/0x50 mm/kasan/kasan.c:303 strlcpy include/linux/string.h:300 [inline] __ip_tunnel_create+0xca/0x6b0 net/ipv4/ip_tunnel.c:257 ip_tunnel_create net/ipv4/ip_tunnel.c:352 [inline] ip_tunnel_ioctl+0x818/0xd40 net/ipv4/ip_tunnel.c:861 ipip_tunnel_ioctl+0x1c5/0x420 net/ipv4/ipip.c:350 dev_ifsioc+0x43e/0xb90 net/core/dev_ioctl.c:334 dev_ioctl+0x69a/0xcc0 net/core/dev_ioctl.c:525 sock_ioctl+0x47e/0x680 net/socket.c:1015 vfs_ioctl fs/ioctl.c:46 [inline] file_ioctl fs/ioctl.c:500 [inline] do_vfs_ioctl+0x1cf/0x1650 fs/ioctl.c:684 ksys_ioctl+0xa9/0xd0 fs/ioctl.c:701 SYSC_ioctl fs/ioctl.c:708 [inline] SyS_ioctl+0x24/0x30 fs/ioctl.c:706 do_syscall_64+0x29e/0x9d0 arch/x86/entry/common.c:287 entry_SYSCALL_64_after_hwframe+0x42/0xb7 Fixes: c54419321455 ("GRE: Refactor GRE tunneling code.") Signed-off-by: Eric Dumazet Reported-by: syzbot Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/ipv4/ip_tunnel.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -253,13 +253,14 @@ static struct net_device *__ip_tunnel_cr struct net_device *dev; char name[IFNAMSIZ]; - if (parms->name[0]) + err = -E2BIG; + if (parms->name[0]) { + if (!dev_valid_name(parms->name)) + goto failed; strlcpy(name, parms->name, IFNAMSIZ); - else { - if (strlen(ops->kind) > (IFNAMSIZ - 3)) { - err = -E2BIG; + } else { + if (strlen(ops->kind) > (IFNAMSIZ - 3)) goto failed; - } strlcpy(name, ops->kind, IFNAMSIZ); strncat(name, "%d", 2); }