Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E413C43381 for ; Mon, 11 Mar 2019 20:48:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 495392064A for ; Mon, 11 Mar 2019 20:48:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="vpVx0yH8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727868AbfCKUsu (ORCPT ); Mon, 11 Mar 2019 16:48:50 -0400 Received: from mail-qt1-f202.google.com ([209.85.160.202]:52606 "EHLO mail-qt1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727008AbfCKUst (ORCPT ); Mon, 11 Mar 2019 16:48:49 -0400 Received: by mail-qt1-f202.google.com with SMTP id d24so241033qtj.19 for ; Mon, 11 Mar 2019 13:48:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=PWnrV1odaWUyybgOACzERFrPluzzYc+b9wTclulAMEU=; b=vpVx0yH8tnbng8DwblszYNnIu9R3qNRvkIfmHNKYJFhgpK7SCkGM/yOaSn9/XHE7s6 32R9bP0hUAj+BsNmWyfKEXT+Ak/aspqm1ry5gruEDdcbP/6bGXe+GkIuX4HiPVzs7ctW L1DKvycrnp9oADwYONoqXn5TX+ETGMTfYtRrBj6SqlhKP9XqGQlnBDYM2sap2u/6+ZGE 6U8WkkJIppME/9oyzlaJlVAqSNUuoOiwqf4Y5mowUBmhqaI/9sL/wwWfdor4CFlI8zPg gJEHf4AAavU2c1/XcpZvN8ja9z40eCXOdx2YVfxmbuV23Q98vldfcWmOMkoFfkL5BfJh 7cHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=PWnrV1odaWUyybgOACzERFrPluzzYc+b9wTclulAMEU=; b=l8uMxPAp7ulmrgOg7Z0zhXvE2Ya/OP9KdIaEvTBV4atvds6hB7aEE6jxCEl118kAjY uyxxg2DhAj45CJZbtRdiO9nQ4sWR5QN8QawByjqJYMxfOFK2xNjFgBSM3v2XA90qTl79 4/xlmra8ywLtHJSLOFqLmk/r1fAco+ea8EYzTY3o1XMVQJFiaN/Wyrq9bU+IHJMR3W7u y6+Mt+74TVHFh9z2u7M37xqKqAOJ2mVM7WUQmdXHAJtMSxLMUbLa5qLRlDNBzQqQtGrE 8mu6xz4h4wGfhnvVbyHpz4Ux6H9tvYgFusfiJTWCn0oIlI2JZ2kQg6o5FWoBERVkrxpN 211A== X-Gm-Message-State: APjAAAXqZVXSdFzJ9Gu7oBix3u7HFXtpE2MF44UcK0Pe69MnEQahwuHK qIJ+Zvn0tArcNdG1T3S9UQGeoFP7uQ0gtg== X-Google-Smtp-Source: APXvYqzFd6lt7RcFoskwGG4u1+jZsjUWHjOCe0ENvB8z6NMi8dESiIePCF7oxImu+cCw++vDWtlYhUyKpfsKsQ== X-Received: by 2002:a0c:afee:: with SMTP id t43mr19169641qvc.62.1552337328590; Mon, 11 Mar 2019 13:48:48 -0700 (PDT) Date: Mon, 11 Mar 2019 13:48:44 -0700 Message-Id: <20190311204844.157555-1-edumazet@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.360.g471c308f928-goog Subject: [PATCH net] net/x25: reset state in x25_connect() From: Eric Dumazet To: "David S . Miller" Cc: netdev , Eric Dumazet , Eric Dumazet , andrew hendry , syzbot Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In case x25_connect() fails and frees the socket neighbour, we also need to undo the change done to x25->state. Before my last bug fix, we had use-after-free so this patch fixes a latent bug. syzbot report : kasan: CONFIG_KASAN_INLINE enabled kasan: GPF could be caused by NULL-ptr deref or user memory access general protection fault: 0000 [#1] PREEMPT SMP KASAN CPU: 1 PID: 16137 Comm: syz-executor.1 Not tainted 5.0.0+ #117 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:x25_write_internal+0x1e8/0xdf0 net/x25/x25_subr.c:173 Code: 00 40 88 b5 e0 fe ff ff 0f 85 01 0b 00 00 48 8b 8b 80 04 00 00 48 ba 00 00 00 00 00 fc ff df 48 8d 79 1c 48 89 fe 48 c1 ee 03 <0f> b6 34 16 48 89 fa 83 e2 07 83 c2 03 40 38 f2 7c 09 40 84 f6 0f RSP: 0018:ffff888076717a08 EFLAGS: 00010207 RAX: ffff88805f2f2292 RBX: ffff8880a0ae6000 RCX: 0000000000000000 kobject: 'loop5' (0000000018d0d0ee): kobject_uevent_env RDX: dffffc0000000000 RSI: 0000000000000003 RDI: 000000000000001c RBP: ffff888076717b40 R08: ffff8880950e0580 R09: ffffed100be5e46d R10: ffffed100be5e46c R11: ffff88805f2f2363 R12: ffff888065579840 kobject: 'loop5' (0000000018d0d0ee): fill_kobj_path: path = '/devices/virtual/block/loop5' R13: 1ffff1100ece2f47 R14: 0000000000000013 R15: 0000000000000013 FS: 00007fb88cf43700(0000) GS:ffff8880ae900000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f9a42a41028 CR3: 0000000087a67000 CR4: 00000000001406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: x25_release+0xd0/0x340 net/x25/af_x25.c:658 __sock_release+0xd3/0x2b0 net/socket.c:579 sock_close+0x1b/0x30 net/socket.c:1162 __fput+0x2df/0x8d0 fs/file_table.c:278 ____fput+0x16/0x20 fs/file_table.c:309 task_work_run+0x14a/0x1c0 kernel/task_work.c:113 get_signal+0x1961/0x1d50 kernel/signal.c:2388 do_signal+0x87/0x1940 arch/x86/kernel/signal.c:816 exit_to_usermode_loop+0x244/0x2c0 arch/x86/entry/common.c:162 prepare_exit_to_usermode arch/x86/entry/common.c:197 [inline] syscall_return_slowpath arch/x86/entry/common.c:268 [inline] do_syscall_64+0x52d/0x610 arch/x86/entry/common.c:293 entry_SYSCALL_64_after_hwframe+0x49/0xbe RIP: 0033:0x457f29 Code: ad b8 fb ff c3 66 2e 0f 1f 84 00 00 00 00 00 66 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 0f 83 7b b8 fb ff c3 66 2e 0f 1f 84 00 00 00 00 RSP: 002b:00007fb88cf42c78 EFLAGS: 00000246 ORIG_RAX: 000000000000002a RAX: fffffffffffffe00 RBX: 0000000000000003 RCX: 0000000000457f29 RDX: 0000000000000012 RSI: 0000000020000080 RDI: 0000000000000004 RBP: 000000000073bf00 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007fb88cf436d4 R13: 00000000004be462 R14: 00000000004cec98 R15: 00000000ffffffff Modules linked in: Fixes: 95d6ebd53c79 ("net/x25: fix use-after-free in x25_device_event()") Signed-off-by: Eric Dumazet Cc: andrew hendry Reported-by: syzbot --- net/x25/af_x25.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 27171ac6fe3b3be975dbca831f2453f637aa8e63..20a511398389d686383e9d8c74434b3f2ad40f3f 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -825,6 +825,7 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, x25_neigh_put(x25->neighbour); x25->neighbour = NULL; read_unlock_bh(&x25_list_lock); + x25->state = X25_STATE_0; } out_put_route: x25_route_put(rt); -- 2.21.0.360.g471c308f928-goog