From patchwork Thu Jun 1 12:38:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 769681 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wdn2g2dYLz9s89 for ; Thu, 1 Jun 2017 22:38:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="GQGt0GoH"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751190AbdFAMig (ORCPT ); Thu, 1 Jun 2017 08:38:36 -0400 Received: from mail-wm0-f50.google.com ([74.125.82.50]:35770 "EHLO mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751134AbdFAMie (ORCPT ); Thu, 1 Jun 2017 08:38:34 -0400 Received: by mail-wm0-f50.google.com with SMTP id b84so157019122wmh.0 for ; Thu, 01 Jun 2017 05:38:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Qc5tyb3Te72I8+60/g4OvnkTXursV5HFuKKTWSYBnLQ=; b=GQGt0GoHZwNuxG/iHRM8eq5TuAmci53g2h7DIzeNMEoHB/BkP0ukU+HaiwcFa6+gLs gxravLSG4B5YnQE92beIA4HGLQo6nOl5AhJ9/M38uSu9l8HHPAH8FaD4VP5GTZeE6gwE 5gfmwpcsJCZBhxk2IVIs8cT7lyNmBYvc130znA5JV+GFHHi4wo96f6Aj3Qp/Mcf81UW1 DxPdOAo7sTohAc+byDqDOysnL5Qa1gsu80LKv8YYhAOwZi9lo8LbPVOhqEErYhMLg98u Lnn2/lsW6ZxVNj/YEb8BgnuqeccDcg1eVA0+zDj//EFwiH6Fs6nV5Oooe3oogRysOFsq KzDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Qc5tyb3Te72I8+60/g4OvnkTXursV5HFuKKTWSYBnLQ=; b=HmPPsg6pwP2Aitc/Vyp4R6diBX6myxGbvbMrKSvulnUwLrZKlZOMNXP1yEqKHSSx/N QqAPH/uPHrhwsvAqfVWxY/rvusPnp0K51u59YfW9lsiEMA7nV6cP42RCye+qnGhet5ND inlboGAa/ibCyBzbI7aULKHcOUP16v9Vr7kqpvaX+cW3+K0jQM6WXx9VvAfM7J2/Vtu3 S52Aja5UnhBpmyNrA2Rg3JFRGXdpGd2JDgohgY7R2cQu3yzM3lgVxsuto7jpa0Ds/3Ae Y3Q0zQVW3sb2zRZw8uEvm7lofqD7Qj03v+oFqtlhKZuY+OKMbl3O1k7CvXlF6p31lX7E 5btA== X-Gm-Message-State: AODbwcBSPdfRQUi+S0TUS0bxBi9UwRoMrfeiXKxeb/A5l46AwiSz2jnj 3yE5QvGSNlNBZBNXw4UsGA== X-Received: by 10.28.1.198 with SMTP id 189mr1477437wmb.18.1496320712487; Thu, 01 Jun 2017 05:38:32 -0700 (PDT) Received: from glider0.muc.corp.google.com ([100.105.28.21]) by smtp.gmail.com with ESMTPSA id 9sm22156864wmh.17.2017.06.01.05.38.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Jun 2017 05:38:31 -0700 (PDT) From: Alexander Potapenko To: dvyukov@google.com, kcc@google.com, edumazet@google.com, davem@davemloft.net, stephen@networkplumber.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v3] net: don't call strlen on non-terminated string in dev_set_alias() Date: Thu, 1 Jun 2017 14:38:29 +0200 Message-Id: <20170601123829.51794-1-glider@google.com> X-Mailer: git-send-email 2.13.0.219.gdb65acc882-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org KMSAN reported a use of uninitialized memory in dev_set_alias(), which was caused by calling strlcpy() (which in turn called strlen()) on the user-supplied non-terminated string. Signed-off-by: Alexander Potapenko --- v3: removed the multi-line comment v2: fixed an off-by-one error spotted by Dmitry Vyukov For the record, here is the KMSAN report: ================================================================== BUG: KMSAN: use of unitialized memory in strlcpy+0x8b/0x1b0 CPU: 0 PID: 1062 Comm: probe Not tainted 4.11.0-rc5+ #2763 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 Call Trace: __dump_stack lib/dump_stack.c:16 dump_stack+0x143/0x1b0 lib/dump_stack.c:52 kmsan_report+0x12a/0x180 mm/kmsan/kmsan.c:1016 __kmsan_warning_32+0x66/0xb0 mm/kmsan/kmsan_instr.c:491 strlen lib/string.c:484 strlcpy+0x8b/0x1b0 lib/string.c:144 dev_set_alias+0x295/0x360 net/core/dev.c:1255 do_setlink+0xfe5/0x5750 net/core/rtnetlink.c:2007 rtnl_setlink+0x469/0x4f0 net/core/rtnetlink.c:2249 rtnetlink_rcv_msg+0x5da/0xb40 net/core/rtnetlink.c:4107 netlink_rcv_skb+0x339/0x5a0 net/netlink/af_netlink.c:2339 rtnetlink_rcv+0x83/0xa0 net/core/rtnetlink.c:4113 netlink_unicast_kernel net/netlink/af_netlink.c:1272 netlink_unicast+0x13b7/0x1480 net/netlink/af_netlink.c:1298 netlink_sendmsg+0x10b8/0x10f0 net/netlink/af_netlink.c:1844 sock_sendmsg_nosec net/socket.c:633 sock_sendmsg net/socket.c:643 sock_write_iter+0x395/0x440 net/socket.c:857 call_write_iter ./include/linux/fs.h:1733 new_sync_write fs/read_write.c:497 __vfs_write+0x619/0x700 fs/read_write.c:510 vfs_write+0x47e/0x8a0 fs/read_write.c:558 SYSC_write+0x17e/0x2f0 fs/read_write.c:605 SyS_write+0x87/0xb0 fs/read_write.c:597 entry_SYSCALL_64_fastpath+0x13/0x94 arch/x86/entry/entry_64.S:204 RIP: 0033:0x4052f1 RSP: 002b:00007fde1ed05d80 EFLAGS: 00000293 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00000000004052f1 RDX: 0000000000000026 RSI: 00000000006cf0c0 RDI: 0000000000000032 RBP: 00007fde1ed05da0 R08: 00007fde1ed06700 R09: 00007fde1ed06700 R10: 00007fde1ed069d0 R11: 0000000000000293 R12: 0000000000000000 R13: 0000000000000000 R14: 00007fde1ed069c0 R15: 00007fde1ed06700 origin: 00000000aec00057 save_stack_trace+0x59/0x60 arch/x86/kernel/stacktrace.c:59 kmsan_save_stack_with_flags mm/kmsan/kmsan.c:352 kmsan_internal_poison_shadow+0xb1/0x1a0 mm/kmsan/kmsan.c:247 kmsan_poison_shadow+0x6d/0xc0 mm/kmsan/kmsan.c:260 slab_alloc_node mm/slub.c:2743 __kmalloc_node_track_caller+0x1f4/0x390 mm/slub.c:4349 __kmalloc_reserve net/core/skbuff.c:138 __alloc_skb+0x2cd/0x740 net/core/skbuff.c:231 alloc_skb ./include/linux/skbuff.h:933 netlink_alloc_large_skb net/netlink/af_netlink.c:1144 netlink_sendmsg+0x934/0x10f0 net/netlink/af_netlink.c:1819 sock_sendmsg_nosec net/socket.c:633 sock_sendmsg net/socket.c:643 sock_write_iter+0x395/0x440 net/socket.c:857 call_write_iter ./include/linux/fs.h:1733 new_sync_write fs/read_write.c:497 __vfs_write+0x619/0x700 fs/read_write.c:510 vfs_write+0x47e/0x8a0 fs/read_write.c:558 SYSC_write+0x17e/0x2f0 fs/read_write.c:605 SyS_write+0x87/0xb0 fs/read_write.c:597 entry_SYSCALL_64_fastpath+0x13/0x94 arch/x86/entry/entry_64.S:204 ================================================================== and the reproducer: ================================================================== #include int sock = -1; char buf[] = "\x26\x00\x00\x00\x13\x00\x47\xf1\x07\x01\xc1\xb0" "\x0e\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00" "\x09\xef\x18\xff\xff\x00\xf1\x32\x05\x00\x14\x00" "\x6e\x35"; void do_work(int arg) { switch (arg) { case 0: sock = socket(0x10, 0x3, 0x0); break; case 1: write(sock, buf, 0x26); break; } } void *thread_fn(void *arg) { int actual_arg = (int)arg; int iter = 10000, i; for (i = 0; i < iter; i++) { do_work(actual_arg); usleep(100); } return NULL; } int main() { pthread_t thr[4]; int i; for (i = 0; i < 4; i++) { pthread_create(&thr, NULL, thread_fn, (void*)(i % 2)); } sleep(10); return 0; } ================================================================== --- net/core/dev.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c index fca407b4a6ea..3e3b29133cc9 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1254,7 +1254,9 @@ int dev_set_alias(struct net_device *dev, const char *alias, size_t len) return -ENOMEM; dev->ifalias = new_ifalias; - strlcpy(dev->ifalias, alias, len+1); + /* alias comes from the userspace and may not be zero-terminated. */ + memcpy(dev->ifalias, alias, len); + dev->ifalias[len] = 0; return len; }