From nobody Mon Apr 6 12:15:16 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 C1ACC2248A5 for ; Fri, 3 Apr 2026 14:52:58 +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=1775227978; cv=none; b=pu8LFBQhKNuQwQZ0ep9LAnsl3qX8YtmKSV5NtFOYFps0Kb/z7pps7r300mtHOXpenmZAEkq/KPj+JMxneDW3myBOukgx3mK+CxTHg/XWLfai8bRi9LbzMfJlJXhDWj9uGSeGTIQYOlABE18xzQuXUaqn1jvn0CnNUzjcQj57j8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775227978; c=relaxed/simple; bh=Pj49/+Xl7A5UQLYU7x1Gm1k6Ia7Msd2SLeAs+Ok8WDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aENab6NY3cdz9aCrF4b6J5JyGqEeBxTODp6uJZSmYHyzkZCORePap6ZfVJfRsZk+HbB4ZsL0b7AtIO1tkMsXt2OIc9k2MOpvtossEDxkZUu3VGLwxnyzp5+yZZHKkSzQaPmV+TH6sK9bw/CvBXmSqmwEP/I8W49XRnDHej2A6L0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iLkDsJBY; 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="iLkDsJBY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9B6A3C4CEF7; Fri, 3 Apr 2026 14:52:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775227978; bh=Pj49/+Xl7A5UQLYU7x1Gm1k6Ia7Msd2SLeAs+Ok8WDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iLkDsJBYnWhGMM1UlULtIXQOsQQzkumxx4Pc8m37LW3kONJeYILHXONn9LxX4U7Rq 6XOb6FKGkxRrVR/K0OwsQhrAkopKlbcXY4NlbOifHO6fM1bbF+1W75mGp1EM9MctkG vd9l65DZ5s4YzNQ+WnNxWaVBjsXmfd3P0krXsvGT2yCW//llMmqsaDq7MmEjHQG8P5 mkYZ6lQZzCc2JbrW1FNo2ZtomJe4ESLEcTsmhlM2CEev7Av3TFc0Uk8fLc5ISuQ4c5 3Ajjj2KvptOK7REVJBglKj4KGGHa9/7PWKiN3wxym0maxJIBqJ8M+lOTWT/U00iHo4 rAAhfZBSK4Gnw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Gang Yan Subject: [RFC mptcp-next v13 09/16] mptcp: enable ulp setsockopt for tls support Date: Fri, 3 Apr 2026 22:51:27 +0800 Message-ID: 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. Co-developed-by: Gang Yan Signed-off-by: Gang Yan Signed-off-by: Geliang Tang --- net/mptcp/sockopt.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index a6230f7910fd..3090228f5ca4 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