From nobody Wed Jun 24 13:21:18 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4ABE430171C for ; Thu, 23 Apr 2026 06:34:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776926079; cv=none; b=bB/laLD0GrUWKfGUEgqRPKhQvAyrMxqDZOxZAVEkFLeMv/bZgYICnoBuZGhs2iPvb5tjEzrpKPbB3ucuiu45r7Stz1EO571gt3GKD37b+CNKVxfkNfPdk6SdHSP3K+fFe+KaLcioV7J8rhc/g23ZI1No/O6lhHPlTZ97JioEboA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776926079; c=relaxed/simple; bh=EhuN2ix8luIrR6qxurBNcW7UV7TUgzkTHK6yaJIOG7Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UXi95cBwG6X2478aM2mtrGWj8LK5B0YFVgC3sJs3jjeelIVNuRgRERxgyRl0M809b5bkD06VwbthAtEe4QQ0Y+uHC2BN98U5nH8POLln0QkSXNNvel+S1fEdA+VULO8uvh8OJxyY9x21nI6Zu8mC+JOv7OuyYB1Nd4g8lJprgkc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N4pprQdt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="N4pprQdt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88339C2BCAF; Thu, 23 Apr 2026 06:33:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1776926079; bh=EhuN2ix8luIrR6qxurBNcW7UV7TUgzkTHK6yaJIOG7Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N4pprQdtM6DlE7ooKPerGBc+hqxOMowufUkQJDSAqOjdSqYBoU+22ofhZjC8i3Gnr bdyGGDRzRo0NSZbu6KTSxFxxr6QLPNFvLer03+V07D5R065Q6kUal/8+gjpgaLgpT7 hsnoXa+LDS23aUvtwZOxw/Q7/GCEsen3eS53pHu7xHUtwEQHlHvYNEQFT++wcszAES 9Z4JNc/dF9vcfvf1goyipOW7Fa7KBskGeu7bGZedTv04xSEYXGXNHUWwHon5cT7+dv f5BX9GgXG9mEWGvTTKXSY5fTxDqzzA1i/aXkB/VL0q785WMCHmizvrr4jzh6brWTPc +u5N7Sfh6CcbQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [PATCH mptcp-next v16 09/16] mptcp: enable ulp setsockopt for tls support Date: Thu, 23 Apr 2026 14:33:02 +0800 Message-ID: <91a651f218d4adddfc8d2e44c21d72510438d390.1776924682.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Allow MPTCP sockets to set the TCP_ULP socket option to enable TLS. Add mptcp_setsockopt_tcp_ulp() which validates the socket state (must not be CLOSE or LISTEN), only accepts "tls" as the ULP name, and then calls tcp_set_ulp(). Include TCP_ULP in the list of supported options in supported_sockopt(), and handle it in setsockopt_sol_tcp() instead of returning -EOPNOTSUPP. Call tcp_cleanup_ulp() in mptcp_destroy_common() to release ULP module's reference count. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 1 + net/mptcp/sockopt.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 765004a49561..8f29bca7cf6f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3635,6 +3635,7 @@ static void mptcp_destroy(struct sock *sk) /* allow the following to close even the initial subflow */ msk->free_first =3D 1; mptcp_destroy_common(msk); + tcp_cleanup_ulp(sk); sk_sockets_allocated_dec(sk); } =20 diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 11e071b0994e..1059efbd4f8f 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -12,6 +12,7 @@ #include #include #include +#include #include "protocol.h" =20 #define MIN_INFO_OPTLEN_SIZE 16 @@ -567,6 +568,7 @@ static bool mptcp_supported_sockopt(int level, int optn= ame) case TCP_FASTOPEN_CONNECT: case TCP_FASTOPEN_KEY: case TCP_FASTOPEN_NO_COOKIE: + case TCP_ULP: return true; } =20 @@ -815,6 +817,37 @@ static int mptcp_setsockopt_all_sf(struct mptcp_sock *= msk, int level, return ret; } =20 +static int mptcp_setsockopt_tcp_ulp(struct sock *sk, sockptr_t optval, + unsigned int optlen) +{ + char name[TCP_ULP_NAME_MAX]; + int err =3D 0; + size_t len; + int val; + + if (optlen < 1) + return -EINVAL; + + len =3D min_t(long, TCP_ULP_NAME_MAX - 1, optlen); + val =3D strncpy_from_sockptr(name, optval, len); + if (val < 0) + return -EFAULT; + name[val] =3D 0; + + if (strcmp(name, "tls")) + return -EOPNOTSUPP; + + sockopt_lock_sock(sk); + if ((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) { + err =3D -ENOTCONN; + goto out; + } + err =3D tcp_set_ulp(sk, name); +out: + sockopt_release_sock(sk); + return err; +} + static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, sockptr_t optval, unsigned int optlen) { @@ -823,7 +856,7 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *= msk, int optname, =20 switch (optname) { case TCP_ULP: - return -EOPNOTSUPP; + return mptcp_setsockopt_tcp_ulp(sk, optval, optlen); case TCP_CONGESTION: return mptcp_setsockopt_sol_tcp_congestion(msk, optval, optlen); case TCP_DEFER_ACCEPT: --=20 2.51.0