From patchwork Mon Apr 17 14:00:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 84261 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2150154vqo; Mon, 17 Apr 2023 07:04:24 -0700 (PDT) X-Google-Smtp-Source: AKy350Yks2d53J0Tji1FW4Bya7irAETPvL/jr6WSBZTz6mjakzzs7/PpjWC4ISxNrPS4jAZ3mY05 X-Received: by 2002:a17:90b:e15:b0:247:3dfd:89f5 with SMTP id ge21-20020a17090b0e1500b002473dfd89f5mr13342068pjb.3.1681740263983; Mon, 17 Apr 2023 07:04:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681740263; cv=none; d=google.com; s=arc-20160816; b=S7QEHRaLyqS3HceLUHfuiZMelUyz1qLHNgFIKAyOGOJsO799paMfEalcy4fYNRSI+C HBM5QaQV+49RRQ34teew1/tfRBsZ5CkHu9Bqp16lj50lxVf74DxX5DH5UCEG5st84h9X YjxnBXXU9xtch6cCLrHru/WKIAsIYuq0ZOrkLbX7THsRDOH3Mynf+1xp9qHpYEsmwNrg y1VA73ze+FIIZcuZsdRhPqCMDc4dHnKshUEhVdsO5lLkQWIclgP3kdu6/oCxU5vwJD56 jwnt2wB+H8gL+HgYIgBOCyiYdioiQcZ6LPkfjRvqyNSX3H3cLemr80EhVBnQxfEIOlzj D+JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=JECxeUvbZZ9hPC67/NBq3Rp9Ecy2taTHWsGgErXwgyw=; b=yaeGH5PHE2dfJoWL6syyYuXXHRJWXQVbhXLMXSARBydlEA4inI2yMVvpkHWrY7aShj cSi4iDRi19q11HZO374lNnkr7x+DZSZRKWlBmfDsSCwH/C1lCWrrQe9N09YDbheW+SAj 5ykSvNFti8L5Ojed/8u5CP/ifOLfbA00gDJi5Z/csEnkzQ4WMgIGLgj50ygyu23IXiEJ NIeB/yhq+VklrD5dlYp09/USEniyFY9Jy804zVYHx4Y5PVOKFQAcNkdvYHoGyzr31/M9 acr4lWJBVNaVcjaLghbK3lIMUI8uRupvNw3Tobr2EWEJQsgPRHSZlNGcarlp2XKAtPpB u4SQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=rsFUEkJN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a14-20020a631a0e000000b0051a650b8f52si12101140pga.259.2023.04.17.07.04.07; Mon, 17 Apr 2023 07:04:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=rsFUEkJN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230195AbjDQOB2 (ORCPT + 99 others); Mon, 17 Apr 2023 10:01:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229903AbjDQOBW (ORCPT ); Mon, 17 Apr 2023 10:01:22 -0400 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3BB22A5D4 for ; Mon, 17 Apr 2023 07:00:51 -0700 (PDT) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-3f167d2941fso14698185e9.1 for ; Mon, 17 Apr 2023 07:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1681740048; x=1684332048; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=JECxeUvbZZ9hPC67/NBq3Rp9Ecy2taTHWsGgErXwgyw=; b=rsFUEkJNTPdoWA3ngIXvX25jPGQXK8mZVD0ka+QLLS0ur2GOmKndxdETaxHM24MZN9 ztxVqRUbYS9yzNb0RJQMYeJHlQoGOKGppUd6HRD7Fo2jJvDauCj6UQ1xljdZ5eVU4f15 OsdBg1ifgxgHZQsmPUQo0nEHVAikeZTXrb1aA6ggcGa3mOYBMBi2sj9V6LXu+R6UlyEl X9t7qurBpI++QP7MIyt+cbQi1cqRojzi/Qi9LihC/r/UL7gruTMn59yWVdefy8rs70OK Nb0WH2W7x8HMYcINQhWp+9uhcL0G0mLIWwVUtaa1Vu8EQwhfnNwGIv9yxQtel981+SMX e7cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681740048; x=1684332048; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JECxeUvbZZ9hPC67/NBq3Rp9Ecy2taTHWsGgErXwgyw=; b=Iy+sBa63ucdp6NfHIBT7+CiBv+AfF+quzf8qKbfM/xn8dhMm13XkM4P3vB7Az2Uf78 JgaZ0kakcaroNlSwdS1DqihDXSGHOyqlmmUxwvTW9gUhmEYBAmDUvkuPoTLkUHeCPBlq z95+g6L55futXd/GF2D3eVcj0A0ekzpWELYPhJ6ceOxLF2h9moWY7zNix26QdMHPbqsi OpX84rCn0yCMKSk1Qe1003Wz4IkZ4ty2tpVMKpdRtzj0TGnepL7w866eYBFXSvirDobS wENkkZvfuL7nUi8P0VIEhfHBXZ9duWODyA1MI9tVd6PpJiLLhG+Rm3LB1bn4uKgXnuPC +WHQ== X-Gm-Message-State: AAQBX9cqR96/IIzX0Hm1UzdOx4u1zNsbXpiD4XlKml4YAhVuZRRk6uBU js/EgDDhOagh6RJ/GrSBdcUO0A== X-Received: by 2002:adf:fecd:0:b0:2f4:867e:efaa with SMTP id q13-20020adffecd000000b002f4867eefaamr5822335wrs.53.1681740047595; Mon, 17 Apr 2023 07:00:47 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id x12-20020adff0cc000000b002d64fcb362dsm10580652wro.111.2023.04.17.07.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:00:47 -0700 (PDT) From: Matthieu Baerts Date: Mon, 17 Apr 2023 16:00:40 +0200 Subject: [PATCH net 1/2] mptcp: stops worker on unaccepted sockets at listener close MIME-Version: 1.0 Message-Id: <20230417-upstream-net-20230417-mptcp-worker-acceptw-v1-1-1d2ecf6d1ae4@tessares.net> References: <20230417-upstream-net-20230417-mptcp-worker-acceptw-v1-0-1d2ecf6d1ae4@tessares.net> In-Reply-To: <20230417-upstream-net-20230417-mptcp-worker-acceptw-v1-0-1d2ecf6d1ae4@tessares.net> To: mptcp@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Paasch , Matthieu Baerts , stable@vger.kernel.org X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7659; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=fZWjtR2Z8eW4quBYJeeppwFrIvT7hTOBQxtUcq0nMOg=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkPVENNG4Q+UmKrUkSHtnWHXcFCBj47LjAHBO97 7XQz30IE2yJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZD1RDQAKCRD2t4JPQmmg c9VBD/9/DyBTfq3DEJkUGmiZR2VdsTFQK0NhqM2y9qFYLt9oXIN6ECo6KKEqrRXJSgSgG8hYix+ 7VIEUprSTAjC6EmLEZqbReVG9rAHzJjCp7zMa2i4lL+4qkrTg0Zr4d2Gp/KG8urb6b6FFPNCNyW PiCFfGmQ1Kr3odp7OBlPSc0DZDkPD4HtOqhQvYeZyF1lxUYBF2UgAJleEa8DsjPnvyrV1Il9j7p A24L0e3Vb3E/dkx+zG1M8IKLpIb6pXVyysaafXzy44kXk6xfDdN5MMQx1vbPIkxJADrwQBGwlWW M4yQVy2HQSWyllDhacoa0Wvnl7lFzBhNeuvLgWExldsWLyV52Vr9Vng4ZTdboE7Y5NNOJAq3hoN wq6HkmadBwUhe4yMGfmx6+UZPrITpYvQP6CBEAyGhgxlUoJPXRGyE0KuuiJb59It9YVL1O8zly1 lq6s9m5BfMx+M8a952rDRkMyy8mq5/f2UlTllAtXb7meRcbtsjcudh0R9QIPjg95nvyPBv/WX/A ZcsZ9MiyUdyK4d9PRAVOz94zoKJ4mK7fFKKJ0lADCZU/r5WNGnLRkgpnRqakm9WZTPthi94//1b lGVZ4UWHnzEifmYw2kRPcOBGmIcKW4KjyN5PgbIBG/arpRbdqILujs0qOjkOM8rclymArCS9vGb gbw2dDy9pc09aNA== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763432479355498077?= X-GMAIL-MSGID: =?utf-8?q?1763432479355498077?= From: Paolo Abeni This is a partial revert of the blamed commit, with a relevant change: mptcp_subflow_queue_clean() now just change the msk socket status and stop the worker, so that the UaF issue addressed by the blamed commit is not re-introduced. The above prevents the mptcp worker from running concurrently with inet_csk_listen_stop(), as such race would trigger a warning, as reported by Christoph: RSP: 002b:00007f784fe09cd8 EFLAGS: 00000246 ORIG_RAX: 000000000000002e WARNING: CPU: 0 PID: 25807 at net/ipv4/inet_connection_sock.c:1387 inet_csk_listen_stop+0x664/0x870 net/ipv4/inet_connection_sock.c:1387 RAX: ffffffffffffffda RBX: 00000000006bc050 RCX: 00007f7850afd6a9 RDX: 0000000000000000 RSI: 0000000020000340 RDI: 0000000000000004 Modules linked in: RBP: 0000000000000002 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000006bc05c R13: fffffffffffffea8 R14: 00000000006bc050 R15: 000000000001fe40 CPU: 0 PID: 25807 Comm: syz-executor.7 Not tainted 6.2.0-g778e54711659 #7 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2.el7 04/01/2014 RIP: 0010:inet_csk_listen_stop+0x664/0x870 net/ipv4/inet_connection_sock.c:1387 RAX: 0000000000000000 RBX: ffff888100dfbd40 RCX: 0000000000000000 RDX: ffff8881363aab80 RSI: ffffffff81c494f4 RDI: 0000000000000005 RBP: ffff888126dad080 R08: 0000000000000005 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000000 R12: ffff888100dfe040 R13: 0000000000000001 R14: 0000000000000000 R15: ffff888100dfbdd8 FS: 00007f7850a2c800(0000) GS:ffff88813bc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000001b32d26000 CR3: 000000012fdd8006 CR4: 0000000000770ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 PKRU: 55555554 Call Trace: __tcp_close+0x5b2/0x620 net/ipv4/tcp.c:2875 __mptcp_close_ssk+0x145/0x3d0 net/mptcp/protocol.c:2427 mptcp_destroy_common+0x8a/0x1c0 net/mptcp/protocol.c:3277 mptcp_destroy+0x41/0x60 net/mptcp/protocol.c:3304 __mptcp_destroy_sock+0x56/0x140 net/mptcp/protocol.c:2965 __mptcp_close+0x38f/0x4a0 net/mptcp/protocol.c:3057 mptcp_close+0x24/0xe0 net/mptcp/protocol.c:3072 inet_release+0x53/0xa0 net/ipv4/af_inet.c:429 __sock_release+0x4e/0xf0 net/socket.c:651 sock_close+0x15/0x20 net/socket.c:1393 __fput+0xff/0x420 fs/file_table.c:321 task_work_run+0x8b/0xe0 kernel/task_work.c:179 resume_user_mode_work include/linux/resume_user_mode.h:49 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] exit_to_user_mode_prepare+0x113/0x120 kernel/entry/common.c:203 __syscall_exit_to_user_mode_work kernel/entry/common.c:285 [inline] syscall_exit_to_user_mode+0x1d/0x40 kernel/entry/common.c:296 do_syscall_64+0x46/0x90 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7f7850af70dc RAX: 0000000000000000 RBX: 0000000000000004 RCX: 00007f7850af70dc RDX: 00007f7850a2c800 RSI: 0000000000000002 RDI: 0000000000000003 RBP: 00000000006bd980 R08: 0000000000000000 R09: 00000000000018a0 R10: 00000000316338a4 R11: 0000000000000293 R12: 0000000000211e31 R13: 00000000006bc05c R14: 00007f785062c000 R15: 0000000000211af0 Fixes: 0a3f4f1f9c27 ("mptcp: fix UaF in listener shutdown") Cc: stable@vger.kernel.org Reported-by: Christoph Paasch Link: https://github.com/multipath-tcp/mptcp_net-next/issues/371 Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts --- net/mptcp/protocol.c | 6 ++++- net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 06c5872e3b00..5181fb91595b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2365,8 +2365,12 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, mptcp_subflow_drop_ctx(ssk); } else { /* otherwise tcp will dispose of the ssk and subflow ctx */ - if (ssk->sk_state == TCP_LISTEN) + if (ssk->sk_state == TCP_LISTEN) { + tcp_set_state(ssk, TCP_CLOSE); + mptcp_subflow_queue_clean(sk, ssk); + inet_csk_listen_stop(ssk); mptcp_event_pm_listener(ssk, MPTCP_EVENT_LISTENER_CLOSED); + } __tcp_close(ssk, 0); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 339a6f072989..3a2db1b862dd 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -629,6 +629,7 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ssk, struct mptcp_subflow_context *subflow); void __mptcp_subflow_send_ack(struct sock *ssk); void mptcp_subflow_reset(struct sock *ssk); +void mptcp_subflow_queue_clean(struct sock *sk, struct sock *ssk); void mptcp_sock_graft(struct sock *sk, struct socket *parent); struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk); bool __mptcp_close(struct sock *sk, long timeout); diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index d34588850545..bf5e5c72b5ee 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -1819,6 +1819,78 @@ static void subflow_state_change(struct sock *sk) } } +void mptcp_subflow_queue_clean(struct sock *listener_sk, struct sock *listener_ssk) +{ + struct request_sock_queue *queue = &inet_csk(listener_ssk)->icsk_accept_queue; + struct mptcp_sock *msk, *next, *head = NULL; + struct request_sock *req; + + /* build a list of all unaccepted mptcp sockets */ + spin_lock_bh(&queue->rskq_lock); + for (req = queue->rskq_accept_head; req; req = req->dl_next) { + struct mptcp_subflow_context *subflow; + struct sock *ssk = req->sk; + + if (!sk_is_mptcp(ssk)) + continue; + + subflow = mptcp_subflow_ctx(ssk); + if (!subflow || !subflow->conn) + continue; + + /* skip if already in list */ + msk = mptcp_sk(subflow->conn); + if (msk->dl_next || msk == head) + continue; + + sock_hold(subflow->conn); + msk->dl_next = head; + head = msk; + } + spin_unlock_bh(&queue->rskq_lock); + if (!head) + return; + + /* can't acquire the msk socket lock under the subflow one, + * or will cause ABBA deadlock + */ + release_sock(listener_ssk); + + for (msk = head; msk; msk = next) { + struct sock *sk = (struct sock *)msk; + + lock_sock_nested(sk, SINGLE_DEPTH_NESTING); + next = msk->dl_next; + msk->dl_next = NULL; + + /* prevent the stack from later re-schedule the worker for + * this socket + */ + inet_sk_state_store(sk, TCP_CLOSE); + release_sock(sk); + + /* lockdep will report a false positive ABBA deadlock + * between cancel_work_sync and the listener socket. + * The involved locks belong to different sockets WRT + * the existing AB chain. + * Using a per socket key is problematic as key + * deregistration requires process context and must be + * performed at socket disposal time, in atomic + * context. + * Just tell lockdep to consider the listener socket + * released here. + */ + mutex_release(&listener_sk->sk_lock.dep_map, _RET_IP_); + mptcp_cancel_work(sk); + mutex_acquire(&listener_sk->sk_lock.dep_map, 0, 0, _RET_IP_); + + sock_put(sk); + } + + /* we are still under the listener msk socket lock */ + lock_sock_nested(listener_ssk, SINGLE_DEPTH_NESTING); +} + static int subflow_ulp_init(struct sock *sk) { struct inet_connection_sock *icsk = inet_csk(sk); From patchwork Mon Apr 17 14:00:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthieu Baerts X-Patchwork-Id: 84262 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2150919vqo; Mon, 17 Apr 2023 07:05:16 -0700 (PDT) X-Google-Smtp-Source: AKy350YUmKGKvNmP2VE0DnB7FBy3/L1ikY0p4kvXid7D9IW1tAtJQtrgKVpCYMtArnAHrSmKyohf X-Received: by 2002:a17:902:f311:b0:1a6:6b9d:5e12 with SMTP id c17-20020a170902f31100b001a66b9d5e12mr10443585ple.8.1681740314905; Mon, 17 Apr 2023 07:05:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681740314; cv=none; d=google.com; s=arc-20160816; b=P1O5mddk4mJFUeVF5D5/e7ilBfBrJgBSQj5ZmwcCXP08ZlT/U6KUOiVJXqc87Cxi5D +Dr9T2lXdchT7BsCBg1kwuG1qQtLr8a0bo71v9Q1zhV4/kSOJ6CvnfSchKV/clKXGA5E aGkYRtgbqOjBFU5tiq0ZqKE1hXQBj72/Zfe4p9En2LC/+mz9hOWF6eB8PpRMzzmyx1ly iHOPzjCcxkKzl71BprQEQPMxIEfIrNOKkymPGvGGSH7MGEA+DEGowHAuKnID8vbXSWyn qYjUw0Jot8ojx2I2Zib0VNJyRK/dhF1W0J2ivq07e6wICxy+rx0PrGJy9a6P0PJatH79 3Pqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=D52vofLjnfZaTVpipN6o3AfEismD0CTamOv8IiipLHM=; b=mIkG7lmoVvd4vhw/Jd85S0AG+wndwwdg2S/JtiZDbs9vzGZxSxZdlFqRR8T0F/5AI7 83NwPd11kR6sEbv00Qyr/DNH3AcTFzPA0mF9dYq45XQoHxhdHEgrn3AayCNxDD08RSVZ brnc+BSiJskV72GXt7i8YWhOu3cw+xgM2IxFBoJ8dP8Tn5WVv0ro0c45qInxGOapXDN1 56pWgUUukX5ptYrUPZmyWH1s4B4iRnqMNDXRC2YBsUTkLYuYOyrrl4OO0GkwpNea/Vpt TEa3XgygeKiHFTjQCwhPvpbi8oCk8AHGFbEyLGIN7e1fGldyfzXcvmvHonzJhjXwKoIP D+YA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=cbs+C2gp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e8-20020a170902744800b0019ca5ddecfesi11617304plt.92.2023.04.17.07.04.54; Mon, 17 Apr 2023 07:05:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=cbs+C2gp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=tessares.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230436AbjDQOBy (ORCPT + 99 others); Mon, 17 Apr 2023 10:01:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230305AbjDQOB0 (ORCPT ); Mon, 17 Apr 2023 10:01:26 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E9B3AF16 for ; Mon, 17 Apr 2023 07:00:54 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id n43-20020a05600c502b00b003f17466a9c1so1252648wmr.2 for ; Mon, 17 Apr 2023 07:00:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; t=1681740049; x=1684332049; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=D52vofLjnfZaTVpipN6o3AfEismD0CTamOv8IiipLHM=; b=cbs+C2gpws7+EdYV4iTgIHMFrcAvRvDCrk406haReBykYygJOwzsg4CYYZZ2lgLur1 O38iHQueCy/c6ix4DFqdnHYKcREnwcjOBjpezH2QwjoOEvuNxBMe773vO/41pJpdoPvG tn7JTmcZyM+UvgbKlcpcT0w3vATxfxg9RqZbVQ/a0iA7dlS5Cg630t2p6LAo3Yzuyhf/ ZT0J3YEMNCH1w/zVoOZuv0dHdhAIZScODksoRSBhmy2Z7vDsAW/mYqc1Ar9xVV/6XIO6 xLDMKde/J0NcYUOMNzhRkD4a+Tsa9dpql7Ws9gG2/cfhx6xXOE3K9Z+sAMqfifqlqUiw 8fWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681740049; x=1684332049; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D52vofLjnfZaTVpipN6o3AfEismD0CTamOv8IiipLHM=; b=T2+ttk+donQ9b+jRbjHY8Pe1zRrZXVN3zlD+mqk+KCEeZMqnNBRCxbqspJrGSubVcL Eh82TyW/lezzzSLhccjEQIF/8Y8xTyGOPyV7m/Jlry1hBdr0UyV+76NBQN/63tWP5f9Z vLmIJhHelWiW0ADHHJbmh3yfKIdmUpXQ+H3M+nQLZm/KKgbfuT9FuTfBEzu687siLUPU 5P7zVoIIabu4DKOfsTNJ/zasrjG3gk5oPg0tp/w1MSoB4/gakCNB1SjVj/vJoZz2m05R k1cH4oaNTsRLmP/NrQjBkbkhcXCqncUR+aZQmx5GxfVDAuhlUIWAVbiC1kiMldVTX9w3 ZdBQ== X-Gm-Message-State: AAQBX9fNyoZjK8clT4bqQUEsDueMwRiPCRIVQVwuib0jeUR9S+qVpn0Q X8v5jwG0dhaovRm3a0GSIHiD5Q== X-Received: by 2002:a05:600c:20d:b0:3f0:9cc6:daf0 with SMTP id 13-20020a05600c020d00b003f09cc6daf0mr11106702wmi.27.1681740048597; Mon, 17 Apr 2023 07:00:48 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id x12-20020adff0cc000000b002d64fcb362dsm10580652wro.111.2023.04.17.07.00.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:00:48 -0700 (PDT) From: Matthieu Baerts Date: Mon, 17 Apr 2023 16:00:41 +0200 Subject: [PATCH net 2/2] mptcp: fix accept vs worker race MIME-Version: 1.0 Message-Id: <20230417-upstream-net-20230417-mptcp-worker-acceptw-v1-2-1d2ecf6d1ae4@tessares.net> References: <20230417-upstream-net-20230417-mptcp-worker-acceptw-v1-0-1d2ecf6d1ae4@tessares.net> In-Reply-To: <20230417-upstream-net-20230417-mptcp-worker-acceptw-v1-0-1d2ecf6d1ae4@tessares.net> To: mptcp@lists.linux.dev, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Christoph Paasch , Matthieu Baerts , stable@vger.kernel.org X-Mailer: b4 0.12.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=11154; i=matthieu.baerts@tessares.net; h=from:subject:message-id; bh=QrFuLM4+lcB9wzHunslsI97c5O8C23TWBj0dwT25Muo=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBkPVENAL8bY1v67Q5Vn6bgvQXkeJPK0Bbqopi9n 1yETsxZ9C6JAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCZD1RDQAKCRD2t4JPQmmg c3zuEACtTSKwTwhStYuM8jHrKAFPBhKdW4gtW67/M9ppnsTYuKb9vY9g+u7uxuC15qH0RrZQmNe dSlLoHSP+T7Cd/Iabxe23KKssWG0ZGuVQUeFpQM1fmO0tji7Sp/WymDzoCWVK8sjDcEq7A8t6nc LZaHmFsORWUwuFPRI2txMyMCQiHkEFWWUn4OSwHG98nqoCXB3vo9rmW7UEhnyRAkqqUWEyYzXPo rPSxOzjt2+9ouXY1mpIXI+kZOkISa5kkElCkoxTQAERlEi412d/jVk4uDaccqQkVWZPu9djFFoi /qL+h6JWMHDS6mYNA9MwwlObyY9FhQujAHax7F9HbdVf4pRRNxczS2fuKQPC2zLtsxc1SyYAnFr FdeTSwwRNPHYOjCHCpuEbqkIDaZIws6tJ1SKEzdAQdNS96ksMb5usPsTvE3Z4F/cibwpJbXY5gg UVlMdVKWNKUm7utDBn6VDxBzAlZl0pMQi3Sy4o8drjjBZxnLlFosQMQFvUkYXhuFvxQQcHOR0ch 9dfPNdGu5G1rHxGfKRyM+xokGoF2kK0wQGUO4USaU6R3ITja7cKw2Xa/1beLJuC08n0spcX1dxK 6v5JfUCglaldVSQHDHop4m4nzZBlbXt1YpzmT2c+lI6F2JuKX3o76952IV29GNWELxB3mMmf1FE UXmAGUDcm3rihug== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763432532615512678?= X-GMAIL-MSGID: =?utf-8?q?1763432532615512678?= From: Paolo Abeni The mptcp worker and mptcp_accept() can race, as reported by Christoph: refcount_t: addition on 0; use-after-free. WARNING: CPU: 1 PID: 14351 at lib/refcount.c:25 refcount_warn_saturate+0x105/0x1b0 lib/refcount.c:25 Modules linked in: CPU: 1 PID: 14351 Comm: syz-executor.2 Not tainted 6.3.0-rc1-gde5e8fd0123c #11 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.0-2.el7 04/01/2014 RIP: 0010:refcount_warn_saturate+0x105/0x1b0 lib/refcount.c:25 Code: 02 31 ff 89 de e8 1b f0 a7 ff 84 db 0f 85 6e ff ff ff e8 3e f5 a7 ff 48 c7 c7 d8 c7 34 83 c6 05 6d 2d 0f 02 01 e8 cb 3d 90 ff <0f> 0b e9 4f ff ff ff e8 1f f5 a7 ff 0f b6 1d 54 2d 0f 02 31 ff 89 RSP: 0018:ffffc90000a47bf8 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 RDX: ffff88802eae98c0 RSI: ffffffff81097d4f RDI: 0000000000000001 RBP: ffff88802e712180 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: ffff88802eaea148 R12: ffff88802e712100 R13: ffff88802e712a88 R14: ffff888005cb93a8 R15: ffff88802e712a88 FS: 0000000000000000(0000) GS:ffff88803ed00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f277fd89120 CR3: 0000000035486002 CR4: 0000000000370ee0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: __refcount_add include/linux/refcount.h:199 [inline] __refcount_inc include/linux/refcount.h:250 [inline] refcount_inc include/linux/refcount.h:267 [inline] sock_hold include/net/sock.h:775 [inline] __mptcp_close+0x4c6/0x4d0 net/mptcp/protocol.c:3051 mptcp_close+0x24/0xe0 net/mptcp/protocol.c:3072 inet_release+0x56/0xa0 net/ipv4/af_inet.c:429 __sock_release+0x51/0xf0 net/socket.c:653 sock_close+0x18/0x20 net/socket.c:1395 __fput+0x113/0x430 fs/file_table.c:321 task_work_run+0x96/0x100 kernel/task_work.c:179 exit_task_work include/linux/task_work.h:38 [inline] do_exit+0x4fc/0x10c0 kernel/exit.c:869 do_group_exit+0x51/0xf0 kernel/exit.c:1019 get_signal+0x12b0/0x1390 kernel/signal.c:2859 arch_do_signal_or_restart+0x25/0x260 arch/x86/kernel/signal.c:306 exit_to_user_mode_loop kernel/entry/common.c:168 [inline] exit_to_user_mode_prepare+0x131/0x1a0 kernel/entry/common.c:203 __syscall_exit_to_user_mode_work kernel/entry/common.c:285 [inline] syscall_exit_to_user_mode+0x19/0x40 kernel/entry/common.c:296 do_syscall_64+0x46/0x90 arch/x86/entry/common.c:86 entry_SYSCALL_64_after_hwframe+0x72/0xdc RIP: 0033:0x7fec4b4926a9 Code: Unable to access opcode bytes at 0x7fec4b49267f. RSP: 002b:00007fec49f9dd78 EFLAGS: 00000246 ORIG_RAX: 00000000000000ca RAX: fffffffffffffe00 RBX: 00000000006bc058 RCX: 00007fec4b4926a9 RDX: 0000000000000000 RSI: 0000000000000080 RDI: 00000000006bc058 RBP: 00000000006bc050 R08: 00000000007df998 R09: 00000000007df998 R10: 0000000000000000 R11: 0000000000000246 R12: 00000000006bc05c R13: fffffffffffffea8 R14: 000000000000000b R15: 000000000001fe40 The root cause is that the worker can force fallback to TCP the first mptcp subflow, actually deleting the unaccepted msk socket. We can explicitly prevent the race delaying the unaccepted msk deletion at listener shutdown time. In case the closed subflow is later accepted, just drop the mptcp context and let the user-space deal with the paired mptcp socket. Fixes: b6985b9b8295 ("mptcp: use the workqueue to destroy unaccepted sockets") Cc: stable@vger.kernel.org Reported-by: Christoph Paasch Link: https://github.com/multipath-tcp/mptcp_net-next/issues/375 Signed-off-by: Paolo Abeni Reviewed-by: Matthieu Baerts Tested-by: Christoph Paasch Signed-off-by: Matthieu Baerts --- net/mptcp/protocol.c | 68 ++++++++++++++++++++++++++++++++++------------------ net/mptcp/protocol.h | 1 + net/mptcp/subflow.c | 22 +++++++++-------- 3 files changed, 58 insertions(+), 33 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 5181fb91595b..b998e9df53ce 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2315,7 +2315,26 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, unsigned int flags) { struct mptcp_sock *msk = mptcp_sk(sk); - bool need_push, dispose_it; + bool dispose_it, need_push = false; + + /* If the first subflow moved to a close state before accept, e.g. due + * to an incoming reset, mptcp either: + * - if either the subflow or the msk are dead, destroy the context + * (the subflow socket is deleted by inet_child_forget) and the msk + * - otherwise do nothing at the moment and take action at accept and/or + * listener shutdown - user-space must be able to accept() the closed + * socket. + */ + if (msk->in_accept_queue && msk->first == ssk) { + if (!sock_flag(sk, SOCK_DEAD) && !sock_flag(ssk, SOCK_DEAD)) + return; + + /* ensure later check in mptcp_worker() will dispose the msk */ + sock_set_flag(sk, SOCK_DEAD); + lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); + mptcp_subflow_drop_ctx(ssk); + goto out_release; + } dispose_it = !msk->subflow || ssk != msk->subflow->sk; if (dispose_it) @@ -2351,18 +2370,6 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, if (!inet_csk(ssk)->icsk_ulp_ops) { WARN_ON_ONCE(!sock_flag(ssk, SOCK_DEAD)); kfree_rcu(subflow, rcu); - } else if (msk->in_accept_queue && msk->first == ssk) { - /* if the first subflow moved to a close state, e.g. due to - * incoming reset and we reach here before inet_child_forget() - * the TCP stack could later try to close it via - * inet_csk_listen_stop(), or deliver it to the user space via - * accept(). - * We can't delete the subflow - or risk a double free - nor let - * the msk survive - or will be leaked in the non accept scenario: - * fallback and let TCP cope with the subflow cleanup. - */ - WARN_ON_ONCE(sock_flag(ssk, SOCK_DEAD)); - mptcp_subflow_drop_ctx(ssk); } else { /* otherwise tcp will dispose of the ssk and subflow ctx */ if (ssk->sk_state == TCP_LISTEN) { @@ -2377,6 +2384,8 @@ static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk, /* close acquired an extra ref */ __sock_put(ssk); } + +out_release: release_sock(ssk); sock_put(ssk); @@ -2431,21 +2440,14 @@ static void __mptcp_close_subflow(struct sock *sk) mptcp_close_ssk(sk, ssk, subflow); } - /* if the MPC subflow has been closed before the msk is accepted, - * msk will never be accept-ed, close it now - */ - if (!msk->first && msk->in_accept_queue) { - sock_set_flag(sk, SOCK_DEAD); - inet_sk_state_store(sk, TCP_CLOSE); - } } -static bool mptcp_check_close_timeout(const struct sock *sk) +static bool mptcp_should_close(const struct sock *sk) { s32 delta = tcp_jiffies32 - inet_csk(sk)->icsk_mtup.probe_timestamp; struct mptcp_subflow_context *subflow; - if (delta >= TCP_TIMEWAIT_LEN) + if (delta >= TCP_TIMEWAIT_LEN || mptcp_sk(sk)->in_accept_queue) return true; /* if all subflows are in closed status don't bother with additional @@ -2653,7 +2655,7 @@ static void mptcp_worker(struct work_struct *work) * even if it is orphaned and in FIN_WAIT2 state */ if (sock_flag(sk, SOCK_DEAD)) { - if (mptcp_check_close_timeout(sk)) { + if (mptcp_should_close(sk)) { inet_sk_state_store(sk, TCP_CLOSE); mptcp_do_fastclose(sk); } @@ -2899,6 +2901,14 @@ static void __mptcp_destroy_sock(struct sock *sk) sock_put(sk); } +void __mptcp_unaccepted_force_close(struct sock *sk) +{ + sock_set_flag(sk, SOCK_DEAD); + inet_sk_state_store(sk, TCP_CLOSE); + mptcp_do_fastclose(sk); + __mptcp_destroy_sock(sk); +} + static __poll_t mptcp_check_readable(struct mptcp_sock *msk) { /* Concurrent splices from sk_receive_queue into receive_queue will @@ -3737,6 +3747,18 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock, if (!ssk->sk_socket) mptcp_sock_graft(ssk, newsock); } + + /* Do late cleanup for the first subflow as necessary. Also + * deal with bad peers not doing a complete shutdown. + */ + if (msk->first && + unlikely(inet_sk_state_load(msk->first) == TCP_CLOSE)) { + __mptcp_close_ssk(newsk, msk->first, + mptcp_subflow_ctx(msk->first), 0); + if (unlikely(list_empty(&msk->conn_list))) + inet_sk_state_store(newsk, TCP_CLOSE); + } + release_sock(newsk); } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 3a2db1b862dd..d6469b6ab38e 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -634,6 +634,7 @@ void mptcp_sock_graft(struct sock *sk, struct socket *parent); struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk); bool __mptcp_close(struct sock *sk, long timeout); void mptcp_cancel_work(struct sock *sk); +void __mptcp_unaccepted_force_close(struct sock *sk); void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk); bool mptcp_addresses_equal(const struct mptcp_addr_info *a, diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index bf5e5c72b5ee..281c1cc8dc8d 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -723,9 +723,12 @@ void mptcp_subflow_drop_ctx(struct sock *ssk) if (!ctx) return; - subflow_ulp_fallback(ssk, ctx); - if (ctx->conn) - sock_put(ctx->conn); + list_del(&mptcp_subflow_ctx(ssk)->node); + if (inet_csk(ssk)->icsk_ulp_ops) { + subflow_ulp_fallback(ssk, ctx); + if (ctx->conn) + sock_put(ctx->conn); + } kfree_rcu(ctx, rcu); } @@ -1824,6 +1827,7 @@ void mptcp_subflow_queue_clean(struct sock *listener_sk, struct sock *listener_s struct request_sock_queue *queue = &inet_csk(listener_ssk)->icsk_accept_queue; struct mptcp_sock *msk, *next, *head = NULL; struct request_sock *req; + struct sock *sk; /* build a list of all unaccepted mptcp sockets */ spin_lock_bh(&queue->rskq_lock); @@ -1839,11 +1843,12 @@ void mptcp_subflow_queue_clean(struct sock *listener_sk, struct sock *listener_s continue; /* skip if already in list */ - msk = mptcp_sk(subflow->conn); + sk = subflow->conn; + msk = mptcp_sk(sk); if (msk->dl_next || msk == head) continue; - sock_hold(subflow->conn); + sock_hold(sk); msk->dl_next = head; head = msk; } @@ -1857,16 +1862,13 @@ void mptcp_subflow_queue_clean(struct sock *listener_sk, struct sock *listener_s release_sock(listener_ssk); for (msk = head; msk; msk = next) { - struct sock *sk = (struct sock *)msk; + sk = (struct sock *)msk; lock_sock_nested(sk, SINGLE_DEPTH_NESTING); next = msk->dl_next; msk->dl_next = NULL; - /* prevent the stack from later re-schedule the worker for - * this socket - */ - inet_sk_state_store(sk, TCP_CLOSE); + __mptcp_unaccepted_force_close(sk); release_sock(sk); /* lockdep will report a false positive ABBA deadlock