From nobody Fri Apr 19 19:38:15 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp249501jap; Thu, 16 Dec 2021 06:34:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJx3oDvzZpgXk4lKGT+hqlIVNINh0Yd+UCXswBceAK4dWX1+zbuSyl8VCS80g8fxsWgjO/4q X-Received: by 2002:a54:4418:: with SMTP id k24mr4285679oiw.23.1639665259232; Thu, 16 Dec 2021 06:34:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639665259; cv=none; d=google.com; s=arc-20160816; b=oH2sSJ/HEc8fzXq4ZjrADVWj4vIEBCcDct3Fm6Cy9xwNqkwavsOV/2sEW76zCE7KRR ewWlMUnc0VkankxyJvDsOgYQTakS150VnYuqscYGeUXz6ysCIcWcvGAR0i04vMIbE5tL dOfkvWSU3Kh+jGQdcTu5LXacH46qs3wZ0QUEU3cJuSWj27qbgxe6SBqwaxvsVZFIykTD c40+dUnHbZM/i1QETFktfl/pQdexfHn6IjtEZphKj+AST0a8cwRcGOqy1MPDIEYiy1U1 pcjvuC/orKflxNK2m42rrZuC1A4jry9r8OyeFjr+dweAFcvMk52HcgZXW3HzkwTnJfGM 0XnQ== 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:to:from :dkim-signature; bh=/T5bDPGlZhTkj3fm7orBGfwMxMMUCH7yToTR22nKMfk=; b=TQHXH6SA21TV5Yal52F+4yg1UXUZI6raF8FOdfE0qb52hu1X/OZJ2RSP7eKyOajIf5 pEIQiKjiPXP9+IrsV2yPCIbHy9E1VPdTUWf5HR9HIVdzl91vtEjHOagwBX5jPkEotGXB r5MKVhKnSFzoWEI1HlsT1z8RMXT/Sf5xPuC0k53PuY43BJs8raiCV2ZLSW9oLuxgX4ot D/+2IvAuZhtLdD5vat3XiYUZWN2dxOSQbQQrH22RmOyzlVK+e6ERJ+lTZEG2tcSvc1QJ +tGCPFdX72kD1q4nkiV5++T0tVplg2bRXlwYLPCUnKgOXujedW49LU3XER2cenWEMpbJ 8Yjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UCA54zjG; spf=pass (google.com: domain of mptcp+bounces-2786-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2786-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id d12si3097066otq.205.2021.12.16.06.34.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Dec 2021 06:34:19 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2786-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UCA54zjG; spf=pass (google.com: domain of mptcp+bounces-2786-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2786-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 sjc.edge.kernel.org (Postfix) with ESMTPS id 4DB923E0E56 for ; Thu, 16 Dec 2021 14:34:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 564672CA4; Thu, 16 Dec 2021 14:34:17 +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 A38A82C82 for ; Thu, 16 Dec 2021 14:34:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639665254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/T5bDPGlZhTkj3fm7orBGfwMxMMUCH7yToTR22nKMfk=; b=UCA54zjG1wgtqD14YQ8XDlSM9ahjG2yp8JBRqm/VoyjxrPnTiYYiZ2xWHebCM9q1uozUet Ya8qHyVF5paO1ckqLdEcopvr5rtdfY1cBwNX91i+5V9SegWQkTYgSieJ2tVMPWuhXNh9Ss gaKTE9kv/DuPKhDkpsyqvSU6F3pndQ0= 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-450-LDObtUoRPaOKTUCXyO4FXw-1; Thu, 16 Dec 2021 09:34:11 -0500 X-MC-Unique: LDObtUoRPaOKTUCXyO4FXw-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 0551039393 for ; Thu, 16 Dec 2021 14:34:11 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66ECD60C7F for ; Thu, 16 Dec 2021 14:34:10 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next] Squash-to: "mptcp: cleanup MPJ subflow list handling" Date: Thu, 16 Dec 2021 15:33:37 +0100 Message-Id: <70e15da075bab481ac07ed1ce8c2adc9740403c6.1639665203.git.pabeni@redhat.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The self-tests in a loop triggered a UaF similar to: https://github.com/multipath-tcp/mptcp_net-next/issues/250 The critical scenario is actually almost fixed by: "mptcp: cleanup MPJ subflow list handling" with a notable exception: if an MPJ handshake races with mptcp_close(), the subflow enter the join_list and __mptcp_finish_join() is processed at the msk socket lock release in mptcp_close(), the subflow will preserver a danfling reference to the msk sk_socket. Address the issue fragting the subflow only on successful __mptcp_finish_join() Note that issues/250 triggers even before "mptcp: cleanup MPJ subflow list handling", as before such commit the join list was not spliced by mptcp_close(). We could consider a net-only patch to address that. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e81fd46a43c4..e89d7741aa7f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -810,9 +810,17 @@ void mptcp_data_ready(struct sock *sk, struct sock *ss= k) =20 static bool __mptcp_finish_join(struct mptcp_sock *msk, struct sock *ssk) { - if (((struct sock *)msk)->sk_state !=3D TCP_ESTABLISHED) + struct sock *sk =3D (struct sock *)msk; + + if (sk->sk_state !=3D TCP_ESTABLISHED) return false; =20 + /* attach to msk socket only after we are sure we will deal with it + * at close time + */ + if (sk->sk_socket && !ssk->sk_socket) + mptcp_sock_graft(ssk, sk->sk_socket); + mptcp_propagate_sndbuf((struct sock *)msk, ssk); mptcp_sockopt_sync_locked(msk, ssk); WRITE_ONCE(msk->allow_infinite_fallback, false); @@ -3234,7 +3242,6 @@ bool mptcp_finish_join(struct sock *ssk) struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); struct sock *parent =3D (void *)msk; - struct socket *parent_sock; bool ret =3D true; =20 pr_debug("msk=3D%p, subflow=3D%p", msk, subflow); @@ -3278,13 +3285,6 @@ bool mptcp_finish_join(struct sock *ssk) return false; } =20 - /* attach to msk socket only after we are sure he will deal with us - * at close time - */ - parent_sock =3D READ_ONCE(parent->sk_socket); - if (parent_sock && !ssk->sk_socket) - mptcp_sock_graft(ssk, parent_sock); - subflow->map_seq =3D READ_ONCE(msk->ack_seq); =20 out: --=20 2.33.1