From patchwork Wed Sep 27 12:16:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 819118 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="tLRZnlo3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y2Gz51khzz9tXf for ; Wed, 27 Sep 2017 22:17:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752736AbdI0MQz (ORCPT ); Wed, 27 Sep 2017 08:16:55 -0400 Received: from mail-wr0-f171.google.com ([209.85.128.171]:48646 "EHLO mail-wr0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752366AbdI0MQx (ORCPT ); Wed, 27 Sep 2017 08:16:53 -0400 Received: by mail-wr0-f171.google.com with SMTP id 108so16120417wra.5 for ; Wed, 27 Sep 2017 05:16:53 -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=guLcVdXogIZJrHqTxnoXkH0Un2l36ztJOcU0v4Qh0NY=; b=tLRZnlo31ZsBw+OtqcIWCWZAIVl1smjJMD26hW/qUKMl8SBNFqq4yX28z6aw6Qvw0I pmVnV7u5o7eh9hTB78S8BfUSQU2Puzu3ZcerFkdblPdgRa/bcN3HM0BOB7Lidxkck3+a cfT23mWFjH8e2vzVwb1r1OYzwMTga7RA65ve703jkA8YBwkUlA1IhT3R+mgFNsYVxCC0 rOl6A7A7Zm4pkGkkydMTogmEekLgzMf3Avdhzuh0GW9FegmzskIihysg9MdJvHp5Sdh/ SAHLgHGJUSlN9IIvzv5GF6CehU04yDVFXv1TezfUrh2HdMoqqCXrUMjJZHsEy/oickU2 c4cA== 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=guLcVdXogIZJrHqTxnoXkH0Un2l36ztJOcU0v4Qh0NY=; b=MP/1GhAytXa/Y7Ocs7Q/mB0uQxeqL7l6F6pDcUfFOfy74JBPIVRXkR44aF5Co/2D+N lan29cmXPo0HYty+h07HMmUge0Glgcl0pTQLaXW57BDENLzr2zOKN3YldxG7Q7J8OpRd AqLkAlPMvpRNpZw+N5uUB/hnmZIJyPdXYtt0Be9sJR7syXV18IATgny8WWk4AMgn0i4P CV2ZxQZrXehFxIE22ffP1d3z98GqB7oOAl5w6PKrus2oKe2w/A3OWagpwvLjp/Z2e7jV VLkknvD0XimGMvG+HKPCV1Hm8e8TYiIWyY7oUATXCZVAdwAaX4xkBuyXouvFhTvGFJa0 vTDw== X-Gm-Message-State: AHPjjUjImU5avXh7SDr4HWY2zf8FFPbQzOEvLI2lDfo6EVmHxq0nVZAA h9Xf0ZO1uHn4Jf9+uqzgh6JsAA== X-Google-Smtp-Source: AOwi7QD517AWxH9JrrpVJoVX1T8bVsKu7qfDAAnMiNkQVC6+8psaNmKoAobwpK3LGq5sgtGLbt5Pvg== X-Received: by 10.223.142.73 with SMTP id n67mr1198840wrb.278.1506514612250; Wed, 27 Sep 2017 05:16:52 -0700 (PDT) Received: from glider0.muc.corp.google.com ([100.105.28.21]) by smtp.gmail.com with ESMTPSA id a19sm15151406wra.64.2017.09.27.05.16.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Sep 2017 05:16:51 -0700 (PDT) From: Alexander Potapenko To: davem@davemloft.net, edumazet@google.com Cc: dvyukov@google.com, syzkaller@googlegroups.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] tun: bail out from tun_get_user() if the skb is empty Date: Wed, 27 Sep 2017 14:16:49 +0200 Message-Id: <20170927121649.90557-1-glider@google.com> X-Mailer: git-send-email 2.14.2.822.g60be5d43e6-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org KMSAN (https://github.com/google/kmsan) reported accessing uninitialized skb->data[0] in the case the skb is empty (i.e. skb->len is 0): Acked-by: Eric Dumazet ================================================ BUG: KMSAN: use of uninitialized memory in tun_get_user+0x19ba/0x3770 CPU: 0 PID: 3051 Comm: probe Not tainted 4.13.0+ #3140 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 Call Trace: ... __msan_warning_32+0x66/0xb0 mm/kmsan/kmsan_instr.c:477 tun_get_user+0x19ba/0x3770 drivers/net/tun.c:1301 tun_chr_write_iter+0x19f/0x300 drivers/net/tun.c:1365 call_write_iter ./include/linux/fs.h:1743 new_sync_write fs/read_write.c:457 __vfs_write+0x6c3/0x7f0 fs/read_write.c:470 vfs_write+0x3e4/0x770 fs/read_write.c:518 SYSC_write+0x12f/0x2b0 fs/read_write.c:565 SyS_write+0x55/0x80 fs/read_write.c:557 do_syscall_64+0x242/0x330 arch/x86/entry/common.c:284 entry_SYSCALL64_slow_path+0x25/0x25 arch/x86/entry/entry_64.S:245 ... origin: ... kmsan_poison_shadow+0x6e/0xc0 mm/kmsan/kmsan.c:211 slab_alloc_node mm/slub.c:2732 __kmalloc_node_track_caller+0x351/0x370 mm/slub.c:4351 __kmalloc_reserve net/core/skbuff.c:138 __alloc_skb+0x26a/0x810 net/core/skbuff.c:231 alloc_skb ./include/linux/skbuff.h:903 alloc_skb_with_frags+0x1d7/0xc80 net/core/skbuff.c:4756 sock_alloc_send_pskb+0xabf/0xfe0 net/core/sock.c:2037 tun_alloc_skb drivers/net/tun.c:1144 tun_get_user+0x9a8/0x3770 drivers/net/tun.c:1274 tun_chr_write_iter+0x19f/0x300 drivers/net/tun.c:1365 call_write_iter ./include/linux/fs.h:1743 new_sync_write fs/read_write.c:457 __vfs_write+0x6c3/0x7f0 fs/read_write.c:470 vfs_write+0x3e4/0x770 fs/read_write.c:518 SYSC_write+0x12f/0x2b0 fs/read_write.c:565 SyS_write+0x55/0x80 fs/read_write.c:557 do_syscall_64+0x242/0x330 arch/x86/entry/common.c:284 return_from_SYSCALL_64+0x0/0x6a arch/x86/entry/entry_64.S:245 ================================================ Make sure tun_get_user() doesn't touch skb->data[0] unless there is actual data. C reproducer below: ========================== // autogenerated by syzkaller (http://github.com/google/syzkaller) #define _GNU_SOURCE #include #include #include #include #include #include int main() { int sock = socket(PF_INET, SOCK_STREAM, IPPROTO_IP); int tun_fd = open("/dev/net/tun", O_RDWR); struct ifreq req; memset(&req, 0, sizeof(struct ifreq)); strcpy((char*)&req.ifr_name, "gre0"); req.ifr_flags = IFF_UP | IFF_MULTICAST; ioctl(tun_fd, TUNSETIFF, &req); ioctl(sock, SIOCSIFFLAGS, "gre0"); write(tun_fd, "hi", 0); return 0; } ========================== Signed-off-by: Alexander Potapenko --- v2: free the skb --- drivers/net/tun.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3c9985f29950..0d60fd4ada9e 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1496,6 +1496,11 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, switch (tun->flags & TUN_TYPE_MASK) { case IFF_TUN: if (tun->flags & IFF_NO_PI) { + if (!skb->len) { + this_cpu_inc(tun->pcpu_stats->rx_dropped); + kfree_skb(skb); + return -EINVAL; + } switch (skb->data[0] & 0xf0) { case 0x40: pi.proto = htons(ETH_P_IP);