From patchwork Tue Sep 26 14:53:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 818699 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="ScAM8lDB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y1kVz0Zsmz9ryk for ; Wed, 27 Sep 2017 00:54:18 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031062AbdIZOyH (ORCPT ); Tue, 26 Sep 2017 10:54:07 -0400 Received: from mail-wr0-f178.google.com ([209.85.128.178]:44602 "EHLO mail-wr0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967702AbdIZOyF (ORCPT ); Tue, 26 Sep 2017 10:54:05 -0400 Received: by mail-wr0-f178.google.com with SMTP id v109so13474797wrc.1 for ; Tue, 26 Sep 2017 07:54:04 -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=4MoFRLisgW0GUzGiTXSD5N3zbC/7iUSZrhJLA7C41eY=; b=ScAM8lDBs5Vc1L5pwH+iC+Em0gnRPOyeOXf4QllqMBTP9LQpg4Xr9G+0KtH/3Hg7JH +b0x2L0Vi23qjd0Ifk56ZWz62oXgX1fFp9AkuPY221KJJAGJN5WVW2QfZmmdEqB/i+rg XbTfpwdhH+c3qs01tYkO0aA8J2lPo4MCqDO5yIB/xtFrqPIXxsfkIwyBkFEwktSkIulj G7ZuT8EHiYtuyy/7UXaGI8zHohU7dwMAsYEvG9WXrlEh9tdGcywTHM6oMASj/3dCWJNn FSulejgb8dBRzMig2c2Y+wNYmGM7qP4wlV26e/2Tzi/LzBYk9nbqWY6lz1bDBcfIV49Q 2/cw== 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=4MoFRLisgW0GUzGiTXSD5N3zbC/7iUSZrhJLA7C41eY=; b=EXnIoMaSCme+eFEK2CoXgCeZjqLkubPWvsTkKl1k7I5hhT6HGIopL24hE1WlTVZWp7 DIWa0O+7YM9iygWjWmIwl2kiq0LDOoSxwgibevLfbQnSjcJ52RPujTekYwHPHv4lDMGs tFXqrvSJhdoFuqXgPwV61q/cshOz7SAR0O00cJOrfx9uhOehAEKO752jsaVTdJTqob1i rzJuWFVMj/AhP8J1zoqkZRXK4TtibV8qx730gUMP91gJC56pCNHGq2uECbHmwCkjZfaS P/25tNjJF2/ODewB6lPepf3OXzcqd9Ex21HZa//en1NVHz2PgLclck/vPGaahPcG4Z0e qITw== X-Gm-Message-State: AHPjjUh8ILbkMRxFJaf5qZrsK5awgKrubDMUFJ7KFziGi74LneTyOP5I s2d+/WCMFhGghUwAwrhNIpYc4Q== X-Google-Smtp-Source: AOwi7QC7JtyODjKvDY2VHAmBtL0b0Gypm9QCxRTA/W3kxqvKfZgplsLSJrNRItlN7TI8ezVEUGSKng== X-Received: by 10.223.161.152 with SMTP id u24mr9947869wru.197.1506437643428; Tue, 26 Sep 2017 07:54:03 -0700 (PDT) Received: from glider0.muc.corp.google.com ([100.105.28.21]) by smtp.gmail.com with ESMTPSA id 10sm3823504wmy.35.2017.09.26.07.54.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 26 Sep 2017 07:54:02 -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] tun: bail out from tun_get_user() if the skb is empty Date: Tue, 26 Sep 2017 16:53:59 +0200 Message-Id: <20170926145359.28344-1-glider@google.com> X-Mailer: git-send-email 2.14.1.821.g8fa685d3b7-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): ================================================ 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 --- drivers/net/tun.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 3c9985f29950..25d96f54a729 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1496,6 +1496,8 @@ 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) + return -EINVAL; switch (skb->data[0] & 0xf0) { case 0x40: pi.proto = htons(ETH_P_IP);