Received: by 2002:ac0:bc90:0:0:0:0:0 with SMTP id a16csp578748img; Fri, 22 Mar 2019 04:26:20 -0700 (PDT) X-Google-Smtp-Source: APXvYqxJwwB9UQ9VMrlQuoRshJIyUK65LIC2PfkV8gyk+X1PLeKyWT/LcAoUlFuJSBVYf4FXRRoD X-Received: by 2002:a65:538b:: with SMTP id x11mr8225541pgq.35.1553253980094; Fri, 22 Mar 2019 04:26:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553253980; cv=none; d=google.com; s=arc-20160816; b=wCxxFXOm03uvfCjTesU3A0NTNNe7Zv/lp4oPfN6jPs6Y2h6kQLPYTwhNMTlhmZUtXH QlVjH9sXu3jzELpDr98WeYhlQFSMTC5wY6Z7Jdie9GQhm0u0v9/6GzBrjKSm4bPMvADe OtGIywPf0UgqqxOgldU2V4rhAu/diFyddqRHKblwdikb/1BA/RnBwwbUWlriECA6bioI Ow3hZUbGig/YxAqUxha8mh1KdHSMDXcn2hVX8C5v6gJUAfx9oZfEZ9fxwmyb6xJHQNVq maZHYYFHBTYyh2tgfHjO4cwdXi3kmnpzZbO7nF49qarLYcW6wQ89gNYXf6L+Ta5VS8V/ X0Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=goSXbtonD48OhBeju1k3btg/IBCMoUJ/PHkGVtHwJXA=; b=BPR5iOSqsiW7/9TSFfKOHtPLXm1kG99Td84H+R2cUo+qazrzrFIYDwGBWgZpBc1WCP kZzLmSuKz0XFFh9J+So9yTF5fGdwgawMMBUaUOpqUV3g7XmNx91QEYbW1aiYW89RL104 eaIaMt2dx4tGeGt2goSQmIJWRa7DrqSVQlSMwsd8QOvUt41TIGQUC5BVpWafDYpOKjyh VmX4lv6qvNPNBlFns9HsDYLmqn/KpEL1DFWayqO8Nv94CrXq5Y4huO31GRtVAnTEIKri ouWkmwo5M6rmAn8/bVgpxhDnCFo0GD2so+r0qLS99lTlbOktu7QPDinqRQhy50jg26Gw RktQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=mAdc7rnB; 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 d62si4147862pfc.104.2019.03.22.04.26.04; Fri, 22 Mar 2019 04:26:20 -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; dkim=pass header.i=@kernel.org header.s=default header.b=mAdc7rnB; 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 S1729150AbfCVLYi (ORCPT + 99 others); Fri, 22 Mar 2019 07:24:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:51652 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729143AbfCVLYf (ORCPT ); Fri, 22 Mar 2019 07:24:35 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 59C1F20657; Fri, 22 Mar 2019 11:24:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553253874; bh=H2AOTMPf/HnoSRteEZV0HOHssymFj8s+4RDKmET2D1g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mAdc7rnBRg1AL3F8D/nFPama2wRqN0sM6QOSdNAXk2rT6a7Z/ut3Fu29SNbQlhxLk fzyIWgu2m2R4QEhoLH2EST70GRt1RGzJWhH71oET6/xgDzPT9bEKEMSYPHDTkjIrhp V73o29Q7ypYaEmEQcGkmv70KNA+O6GY9E9NNWwiQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Eric Dumazet , andrew hendry , syzbot , "David S. Miller" Subject: [PATCH 3.18 083/134] net/x25: reset state in x25_connect() Date: Fri, 22 Mar 2019 12:14:56 +0100 Message-Id: <20190322111216.122284532@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190322111210.465931067@linuxfoundation.org> References: <20190322111210.465931067@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit ee74d0bd4325efb41e38affe5955f920ed973f23 ] 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/x25/af_x25.c | 1 + 1 file changed, 1 insertion(+) --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -817,6 +817,7 @@ out_put_neigh: 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);