From nobody Sun May 5 16:13:02 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp3335115jap; Sat, 11 Dec 2021 08:11:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJwTaU3zih1PTjv4vkOTS4Yji9W3gbJLRbKyJcR909Mdc+8P+vmU5eysO15yTdik8q8SNL+3 X-Received: by 2002:a0c:edca:: with SMTP id i10mr32063205qvr.62.1639239113060; Sat, 11 Dec 2021 08:11:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639239113; cv=none; d=google.com; s=arc-20160816; b=CnOIVEFt+8KXe0ShI0VU9eftZ0nnQkUHTuao4Kf24Jzn+i2W42UK+ShfAVY8yMkwz1 xWBFrCwos5NrHdYpPL8Ic6qj9/ExAoPCXCp2lDjgWBakYquVMNe2pU2X32GlNjQJGw5g 3JHnChqXCrkogXWAxTXAZ9hOIIlaijrxrZpy1DCOR/DyvXFrVKYrJGkttkJG+ebMMZKi tO/wFQyh37N460anPyMxWIkZqkPV236yNyzDHOowyIY+noDFdks/+Twk6CXaCQkBdcvb 0huFgNO2CIanUpyGwc310sePjPyDdjiZcgpQR5XprACcVZa7KOOhuCpKcS4eCbQ4cDsA aAqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=GQ9xh+D/1SeL383/68SRgs7GGISVsePJUy2mdr8iR3E=; b=TudOFQSyh/MLFOI3FQ8o6wQ/RraILdx3fAkbi92d5WSkhepNTOsb/i4gwZfy9r3JKa J0TJ855Xm5NPbGZxZgbjpA+2B+alXE6DP4uI38+mpsotpMZ9iKQNDYrwy4b96ZYTE8jF lKyRTrN3cXv7aKgSq3b30hdyzmWI0j5wKvrSA3/ejA1S6B0qLluNtJd+2y5VjaIz2JNH ouKDj4AO3xY13lB1K+31QfUr+yhbUrLWinXfvR/hFhuZYNtQS6Ciz4fcg59yEeCmTywU PCyLlwI7k3jgFh03f8G5adJe4CAKXZi4eyf05mXO1BRTcLNqkswFwYDL3be7pfOH7vix v/TA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CgObJJ1R; spf=pass (google.com: domain of mptcp+bounces-2724-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2724-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id i5si6266065qkg.28.2021.12.11.08.11.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Dec 2021 08:11:53 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2724-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=CgObJJ1R; spf=pass (google.com: domain of mptcp+bounces-2724-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2724-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ewr.edge.kernel.org (Postfix) with ESMTPS id 79BC81C0CBA for ; Sat, 11 Dec 2021 16:11:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EB1CD2CA1; Sat, 11 Dec 2021 16:11:50 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 88EF0173 for ; Sat, 11 Dec 2021 16:11:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639239108; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=GQ9xh+D/1SeL383/68SRgs7GGISVsePJUy2mdr8iR3E=; b=CgObJJ1R+mN11sD5tN8ys0kKPuh7lGUttR65MdYEe0pKidyS2kLaCpj6OITKxNOshNYHCt MKvH1KvBiXPHYXgQTLy790dY7l9timr5x31Qzt7Uf/PMEkuRB+eVDwi+y1QwnCZJ0NItlX 3hin4adsGCW+DmAThNJ8CsBFLN7v4O8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-232-NqxIWm_KNP6t_V-N-iczIQ-1; Sat, 11 Dec 2021 11:11:44 -0500 X-MC-Unique: NqxIWm_KNP6t_V-N-iczIQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B641418C8C03; Sat, 11 Dec 2021 16:11:43 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7850460C17; Sat, 11 Dec 2021 16:11:42 +0000 (UTC) From: Paolo Abeni To: netdev@vger.kernel.org Cc: Geliang Tang , mptcp@lists.linux.dev Subject: [PATCH net] mptcp: never allow the PM to close a listener subflow Date: Sat, 11 Dec 2021 17:11:12 +0100 Message-Id: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Content-Type: text/plain; charset="utf-8" Currently, when deleting an endpoint the netlink PM treverses all the local MPTCP sockets, regardless of their status. If an MPTCP listener socket is bound to the IP matching the delete endpoint, the listener TCP socket will be closed. That is unexpected, the PM should only affect data subflows. Additionally, syzbot was able to trigger a NULL ptr dereference due to the above: general protection fault, probably for non-canonical address 0xdffffc000000= 0003: 0000 [#1] PREEMPT SMP KASAN KASAN: null-ptr-deref in range [0x0000000000000018-0x000000000000001f] CPU: 1 PID: 6550 Comm: syz-executor122 Not tainted 5.16.0-rc4-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Goo= gle 01/01/2011 RIP: 0010:__lock_acquire+0xd7d/0x54a0 kernel/locking/lockdep.c:4897 Code: 0f 0e 41 be 01 00 00 00 0f 86 c8 00 00 00 89 05 69 cc 0f 0e e9 bd 00 = 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 da 48 c1 ea 03 <80> 3c 02 00 0f 8= 5 f3 2f 00 00 48 81 3b 20 75 17 8f 0f 84 52 f3 ff RSP: 0018:ffffc90001f2f818 EFLAGS: 00010016 RAX: dffffc0000000000 RBX: 0000000000000018 RCX: 0000000000000000 RDX: 0000000000000003 RSI: 0000000000000000 RDI: 0000000000000001 RBP: 0000000000000000 R08: 0000000000000001 R09: 0000000000000001 R10: 0000000000000000 R11: 000000000000000a R12: 0000000000000000 R13: ffff88801b98d700 R14: 0000000000000000 R15: 0000000000000001 FS: 00007f177cd3d700(0000) GS:ffff8880b9d00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f177cd1b268 CR3: 000000001dd55000 CR4: 0000000000350ee0 Call Trace: lock_acquire kernel/locking/lockdep.c:5637 [inline] lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5602 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0x39/0x50 kernel/locking/spinlock.c:162 finish_wait+0xc0/0x270 kernel/sched/wait.c:400 inet_csk_wait_for_connect net/ipv4/inet_connection_sock.c:464 [inline] inet_csk_accept+0x7de/0x9d0 net/ipv4/inet_connection_sock.c:497 mptcp_accept+0xe5/0x500 net/mptcp/protocol.c:2865 inet_accept+0xe4/0x7b0 net/ipv4/af_inet.c:739 mptcp_stream_accept+0x2e7/0x10e0 net/mptcp/protocol.c:3345 do_accept+0x382/0x510 net/socket.c:1773 __sys_accept4_file+0x7e/0xe0 net/socket.c:1816 __sys_accept4+0xb0/0x100 net/socket.c:1846 __do_sys_accept net/socket.c:1864 [inline] __se_sys_accept net/socket.c:1861 [inline] __x64_sys_accept+0x71/0xb0 net/socket.c:1861 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f177cd8b8e9 Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 b1 14 00 00 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 f= f 73 01 c3 48 c7 c1 b8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f177cd3d308 EFLAGS: 00000246 ORIG_RAX: 000000000000002b RAX: ffffffffffffffda RBX: 00007f177ce13408 RCX: 00007f177cd8b8e9 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000003 RBP: 00007f177ce13400 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00007f177ce1340c R13: 00007f177cde1004 R14: 6d705f706374706d R15: 0000000000022000 Fix the issue explicitly skipping MPTCP socket in TCP_LISTEN status. Reported-and-tested-by: syzbot+e4d843bb96a9431e6331@syzkaller.appspotmail.c= om Reviewed-by: Mat Martineau Fixes: 740d798e8767 ("mptcp: remove id 0 address") Signed-off-by: Paolo Abeni --- net/mptcp/pm_netlink.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 7b96be1e9f14..f523051f5aef 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -700,6 +700,9 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp= _sock *msk, =20 msk_owned_by_me(msk); =20 + if (sk->sk_state =3D=3D TCP_LISTEN) + return; + if (!rm_list->nr) return; =20 --=20 2.33.1