From nobody Sun Feb 8 12:32:33 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp221974jap; Wed, 10 Nov 2021 04:32:40 -0800 (PST) X-Google-Smtp-Source: ABdhPJzMJDyl+59gQ/BABPRdxC4/pmT/S7dadjt51wrTN2FYWsxZ6IT+UIgg9teHNoGVeUUZNy5H X-Received: by 2002:a17:90a:3009:: with SMTP id g9mr16633869pjb.205.1636547560555; Wed, 10 Nov 2021 04:32:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636547560; cv=none; d=google.com; s=arc-20160816; b=U/aBZ142lE2hlnjeqhmjXxbCdjtz9IhQ12wqPwxszKhYMf810fDjQ+UBMnxBzuIRzT 3jxoUeS2EvbtmK76RpR8RODkmMR59YoO8HCCxcmm8JqKWUKfYHPGLtpNOi7O9dnIYVAI 6PoMSK9fFGhS00a52mdMC51ACQJc9vT9/Hq/8MBQtim5B+oXinFKzPKn/2VJ8O+vWunt oQ8od+7c0pDPDkPNLhvEAo0C8mLgP5WdrJ7Nnb1bp+LA7KuKT/oGXccJUyH30EjmLq2b Prun9gUUx14npneC8WkaVxoXhxwwtpGNRlbLR3eEYvbSnZU7n/iUXSVfks0PMLVu4eeR tHag== 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:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=44DfOAC6I6ruJeti5Ujr/kwA8RUOK+Jd1rYbql/5lMM=; b=DMWJ0y8ylzCnTjXQMmLDl+uz0702CZ0ff1tUWhyRxXqTyIMvkd2gfR7H1Y71mZMIhR S+PUoC+vC0h4E0cQuk/WNmLJKmDq+RtYsf7eDsjk05394xoQAZjTYWAy9ldpcBoRnGGN b7HPOyorfqsib4ASO8OgzNMMYEhFRAgm/g0o308orb9CISyyb1EksCMzWvzokndkR99z ugZEDNfwrOq2VJQDTbESg4hRbJJe1VJHP9i0cInbb7zL3Gnx/Uwia11OSIRPbibmImKG LT1fsLyTb+1QASWBVxXBToqliFmERHcXSLshHzi61UvcTsLncKbaLQw4358WBLKJUFPN MJqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gxWr9DW6; spf=pass (google.com: domain of mptcp+bounces-2405-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2405-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 n2si10317814pjp.152.2021.11.10.04.32.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Nov 2021 04:32:40 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2405-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=gxWr9DW6; spf=pass (google.com: domain of mptcp+bounces-2405-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2405-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 235AA3E0F68 for ; Wed, 10 Nov 2021 12:32:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1B8BA2C87; Wed, 10 Nov 2021 12:32:37 +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.129.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 0C29E2C88 for ; Wed, 10 Nov 2021 12:32:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636547555; 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: in-reply-to:in-reply-to:references:references; bh=44DfOAC6I6ruJeti5Ujr/kwA8RUOK+Jd1rYbql/5lMM=; b=gxWr9DW6iZ22PSLzGFh/wxAZC4gXZQeLFS/HfIebboSxH9f6CduPI41NkAR9rvaGW7YutD T9wUJkZjw4mougciir3AW/DjCXMtBkEehEDNCtCcmAcZqwNbgeEKrBIYq2bS2xFwihoIAM odwh7CUJGo/wvJrrFRGCFn50Pqz2r3c= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-77-8THHIaTgNdyKi-VIw2b7uw-1; Wed, 10 Nov 2021 07:32:34 -0500 X-MC-Unique: 8THHIaTgNdyKi-VIw2b7uw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 24C21804141 for ; Wed, 10 Nov 2021 12:32:33 +0000 (UTC) Received: from gerbillo.fritz.box (unknown [10.39.194.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 891D760854 for ; Wed, 10 Nov 2021 12:32:32 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH net-next 6/7] mptcp: implement support for user-space disconnect Date: Wed, 10 Nov 2021 13:31:39 +0100 Message-Id: <043b4da7d9e09d9eb822571d481cce731dc5bf68.1636545174.git.pabeni@redhat.com> In-Reply-To: References: 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.13 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" Handle explicitly AF_UNSPEC in mptcp_stream_connnect() to allow user-space to disconnect established MPTCP connections Signed-off-by: Paolo Abeni --- net/mptcp/protocol.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index ee2a5169c13a..8319db8ae3ed 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3428,9 +3428,20 @@ static int mptcp_stream_connect(struct socket *sock,= struct sockaddr *uaddr, struct mptcp_sock *msk =3D mptcp_sk(sock->sk); struct mptcp_subflow_context *subflow; struct socket *ssock; - int err; + int err =3D -EINVAL; =20 lock_sock(sock->sk); + if (uaddr) { + if (addr_len < sizeof(uaddr->sa_family)) + goto unlock; + + if (uaddr->sa_family =3D=3D AF_UNSPEC) { + err =3D mptcp_disconnect(sock->sk, flags); + sock->state =3D err ? SS_DISCONNECTING : SS_UNCONNECTED; + goto unlock; + } + } + if (sock->state !=3D SS_UNCONNECTED && msk->subflow) { /* pending connection or invalid state, let existing subflow * cope with that @@ -3440,10 +3451,8 @@ static int mptcp_stream_connect(struct socket *sock,= struct sockaddr *uaddr, } =20 ssock =3D __mptcp_nmpc_socket(msk); - if (!ssock) { - err =3D -EINVAL; + if (!ssock) goto unlock; - } =20 mptcp_token_destroy(msk); inet_sk_state_store(sock->sk, TCP_SYN_SENT); --=20 2.33.1