Skip to contentSkip to conversation

net: tls: explicitly disallow disconnect

PATCH Applied Jakub Kicinski 7 participants 9 messages Apr 4, 2025 – Apr 15, 2025

Subsystems (5)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/2 net: tls: explicitly disallow disconnect

syzbot discovered that it can disconnect a TLS socket and then run into all sort of unexpected corner cases. I have a vague recollection of Eric pointing this out to us a long time ago. Supporting disconnect is really hard, for one thing if offload is enabled we'd need to wait for all packets to be _acked_. Disconnect is not commonly used, disallow it.

The immediate problem syzbot run into is the warning in the strp, but that's just the easiest bug to trigger:

  WARNING: CPU: 0 PID: 5834 at net/tls/tls_strp.c:486 tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  RIP: 0010:tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  Call Trace:
   <TASK>
   tls_rx_rec_wait+0x280/0xa60 net/tls/tls_sw.c:1363
   tls_sw_recvmsg+0x85c/0x1c30 net/tls/tls_sw.c:2043
   inet6_recvmsg+0x2c9/0x730 net/ipv6/af_inet6.c:678
   sock_recvmsg_nosec net/socket.c:1023 [inline]
   sock_recvmsg+0x109/0x280 net/socket.c:1045
   __sys_recvfrom+0x202/0x380 net/socket.c:2237
Fixes 3c4d7559159b ("tls: kernel TLS support")
Reported-by [email protected]
---
 net/tls/tls_main.c | 6 ++++++
 1 file changed, 6 insertions(+)
net/tls/tls_main.c +6 -0
index cb86b0bf9a53..a3ccb3135e51 100644
@@ -852,6 +852,11 @@ static int tls_setsockopt(struct sock *sk, int level, int optname,
 	return do_tls_setsockopt(sk, optname, optval, optlen);
 }
 
+static int tls_disconnect(struct sock *sk, int flags)
+{
+	return -EOPNOTSUPP;
+}
+
 struct tls_context *tls_ctx_create(struct sock *sk)
 {
 	struct inet_connection_sock *icsk = inet_csk(sk);
@@ -947,6 +952,7 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG],
 	prot[TLS_BASE][TLS_BASE] = *base;
 	prot[TLS_BASE][TLS_BASE].setsockopt	= tls_setsockopt;
 	prot[TLS_BASE][TLS_BASE].getsockopt	= tls_getsockopt;
+	prot[TLS_BASE][TLS_BASE].disconnect	= tls_disconnect;
 	prot[TLS_BASE][TLS_BASE].close		= tls_sk_proto_close;
 
 	prot[TLS_SW][TLS_BASE] = prot[TLS_BASE][TLS_BASE];
Signature · 1 line
2.49.0
author maintainer
#1 lore raw

PATCH 2/2 selftests: tls: check that disconnect does nothing

"Inspired" by syzbot test, pre-queue some data, disconnect() and try to receive(). This used to trigger a warning in TLS's strp. Now we expect the disconnect() to have almost no effect.

---
 tools/testing/selftests/net/tls.c | 36 +++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
tools/testing/selftests/net/tls.c +36 -0
index 9a85f93c33d8..5ded3b3a7538 100644
@@ -1753,6 +1753,42 @@ TEST_F(tls_basic, rekey_tx)
 	EXPECT_EQ(memcmp(buf, test_str, send_len), 0);
 }
 
+TEST_F(tls_basic, disconnect)
+{
+	char const *test_str = "test_message";
+	int send_len = strlen(test_str) + 1;
+	struct tls_crypto_info_keys key;
+	struct sockaddr_in addr;
+	char buf[20];
+	int ret;
+
+	if (self->notls)
+		return;
+
+	tls_crypto_info_init(TLS_1_3_VERSION, TLS_CIPHER_AES_GCM_128,
+			     &key, 0);
+
+	ret = setsockopt(self->fd, SOL_TLS, TLS_TX, &key, key.len);
+	ASSERT_EQ(ret, 0);
+
+	/* Pre-queue the data so that setsockopt parses it but doesn't
+	 * dequeue it from the TCP socket. recvmsg would dequeue.
+	 */
+	EXPECT_EQ(send(self->fd, test_str, send_len, 0), send_len);
+
+	ret = setsockopt(self->cfd, SOL_TLS, TLS_RX, &key, key.len);
+	ASSERT_EQ(ret, 0);
+
+	addr.sin_family = AF_UNSPEC;
+	addr.sin_addr.s_addr = htonl(INADDR_ANY);
+	addr.sin_port = 0;
+	ret = connect(self->cfd, &addr, sizeof(addr));
+	EXPECT_EQ(ret, -1);
+	EXPECT_EQ(errno, EOPNOTSUPP);
+
+	EXPECT_EQ(recv(self->cfd, buf, send_len, 0), send_len);
+}
+
 TEST_F(tls, rekey)
 {
 	char const *test_str_1 = "test_message_before_rekey";
Signature · 1 line
2.49.0
maintainer Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH net 2/2] selftests: tls: check that disconnect does nothing

Quoted 6 lines · Jakub Kicinski

"Inspired" by syzbot test, pre-queue some data, disconnect() and try to receive(). This used to trigger a warning in TLS's strp. Now we expect the disconnect() to have almost no effect.

Signature · 1 line
Sabrina
Reviewed-by on v1 1/2
#3 lore raw
In reply to Jakub Kicinski
Quoted 7 lines · Jakub Kicinski

syzbot discovered that it can disconnect a TLS socket and then run into all sort of unexpected corner cases. I have a vague recollection of Eric pointing this out to us a long time ago. Supporting disconnect is really hard, for one thing if offload is enabled we'd need to wait for all packets to be _acked_. Disconnect is not commonly used, disallow it.

Indeed.

We have sk->sk_disconnects for protocols that have/want to support disconnect.

Anyone interested would have to look at commit 419ce133ab928ab5 ("tcp:
allow again tcp_disconnect() when threads are waiting")

Quoted 15 lines

The immediate problem syzbot run into is the warning in the strp, but that's just the easiest bug to trigger:

  WARNING: CPU: 0 PID: 5834 at net/tls/tls_strp.c:486 tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  RIP: 0010:tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  Call Trace:
   <TASK>
   tls_rx_rec_wait+0x280/0xa60 net/tls/tls_sw.c:1363
   tls_sw_recvmsg+0x85c/0x1c30 net/tls/tls_sw.c:2043
   inet6_recvmsg+0x2c9/0x730 net/ipv6/af_inet6.c:678
   sock_recvmsg_nosec net/socket.c:1023 [inline]
   sock_recvmsg+0x109/0x280 net/socket.c:1045
   __sys_recvfrom+0x202/0x380 net/socket.c:2237
Quoted 3 lines
Fixes 3c4d7559159b ("tls: kernel TLS support")
Reported-by [email protected]
maintainer Reviewed-by on v1 1/2
#4 lore raw
In reply to Jakub Kicinski
Quoted 21 lines · Jakub Kicinski

syzbot discovered that it can disconnect a TLS socket and then run into all sort of unexpected corner cases. I have a vague recollection of Eric pointing this out to us a long time ago. Supporting disconnect is really hard, for one thing if offload is enabled we'd need to wait for all packets to be _acked_. Disconnect is not commonly used, disallow it.

The immediate problem syzbot run into is the warning in the strp, but that's just the easiest bug to trigger:

  WARNING: CPU: 0 PID: 5834 at net/tls/tls_strp.c:486 tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  RIP: 0010:tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  Call Trace:
   <TASK>
   tls_rx_rec_wait+0x280/0xa60 net/tls/tls_sw.c:1363
   tls_sw_recvmsg+0x85c/0x1c30 net/tls/tls_sw.c:2043
   inet6_recvmsg+0x2c9/0x730 net/ipv6/af_inet6.c:678
   sock_recvmsg_nosec net/socket.c:1023 [inline]
   sock_recvmsg+0x109/0x280 net/socket.c:1045
   __sys_recvfrom+0x202/0x380 net/socket.c:2237
Quoted 3 lines
Fixes 3c4d7559159b ("tls: kernel TLS support")
Reported-by [email protected]

(hopefully nobody complains about this. but since it was broken anyway...)

Signature · 1 line
Sabrina
#5 lore raw
In reply to Jakub Kicinski
This series was applied to netdev/net.git (main) by Paolo Abeni <[email protected]>:

Hello:

This series was applied to netdev/net.git (main)
by Paolo Abeni <[email protected]>:

Quoted 8 lines · On Fri, 4 Apr 2025 11:03:33 -0700 you wrote:

syzbot discovered that it can disconnect a TLS socket and then run into all sort of unexpected corner cases. I have a vague recollection of Eric pointing this out to us a long time ago. Supporting disconnect is really hard, for one thing if offload is enabled we'd need to wait for all packets to be _acked_. Disconnect is not commonly used, disallow it.

[...]

Here is the summary with links:
- [net,1/2] net: tls: explicitly disallow disconnect

    https://git.kernel.org/netdev/net/c/5071a1e606b3
  - [net,2/2] selftests: tls: check that disconnect does nothing
    https://git.kernel.org/netdev/net/c/a1328a671e1c

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
reviewer
#6 lore raw
In reply to Jakub Kicinski
Quoted 21 lines · Jakub Kicinski

syzbot discovered that it can disconnect a TLS socket and then run into all sort of unexpected corner cases. I have a vague recollection of Eric pointing this out to us a long time ago. Supporting disconnect is really hard, for one thing if offload is enabled we'd need to wait for all packets to be _acked_. Disconnect is not commonly used, disallow it.

The immediate problem syzbot run into is the warning in the strp, but that's just the easiest bug to trigger:

  WARNING: CPU: 0 PID: 5834 at net/tls/tls_strp.c:486 tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  RIP: 0010:tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  Call Trace:
   <TASK>
   tls_rx_rec_wait+0x280/0xa60 net/tls/tls_sw.c:1363
   tls_sw_recvmsg+0x85c/0x1c30 net/tls/tls_sw.c:2043
   inet6_recvmsg+0x2c9/0x730 net/ipv6/af_inet6.c:678
   sock_recvmsg_nosec net/socket.c:1023 [inline]
   sock_recvmsg+0x109/0x280 net/socket.c:1045
   __sys_recvfrom+0x202/0x380 net/socket.c:2237
Quoted 3 lines
Fixes 3c4d7559159b ("tls: kernel TLS support")
Reported-by [email protected]

Hi everyone.

This patch has broken a BPF selftest and as a result BPF CI:
* https://github.com/kernel-patches/bpf/actions/runs/14458537639
* https://github.com/kernel-patches/bpf/actions/runs/14457178732

The test in question is test_sockmap_ktls_disconnect_after_delete (tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c) [1].

Since the test is about disconnect use-case, and the patch disallows it, I assume it's appropriate to simply remove the test?

Please let me know. Thanks.

[1] https://web.git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c#n28

Quoted 28 lines
---
 net/tls/tls_main.c | 6 ++++++
 1 file changed, 6 insertions(+)
net/tls/tls_main.c +6 -0
index cb86b0bf9a53..a3ccb3135e51 100644
@@ -852,6 +852,11 @@ static int tls_setsockopt(struct sock *sk, int level, int optname,
 	return do_tls_setsockopt(sk, optname, optval, optlen);
 }
 
+static int tls_disconnect(struct sock *sk, int flags)
+{
+	return -EOPNOTSUPP;
+}
+
 struct tls_context *tls_ctx_create(struct sock *sk)
 {
 	struct inet_connection_sock *icsk = inet_csk(sk);
@@ -947,6 +952,7 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG],
 	prot[TLS_BASE][TLS_BASE] = *base;
 	prot[TLS_BASE][TLS_BASE].setsockopt	= tls_setsockopt;
 	prot[TLS_BASE][TLS_BASE].getsockopt	= tls_getsockopt;
+	prot[TLS_BASE][TLS_BASE].disconnect	= tls_disconnect;
 	prot[TLS_BASE][TLS_BASE].close		= tls_sk_proto_close;
 
 	prot[TLS_SW][TLS_BASE] = prot[TLS_BASE][TLS_BASE];
maintainer
#7 lore raw
Quoted 32 lines · Ihor Solodrai
Quoted 21 lines · Jakub Kicinski

syzbot discovered that it can disconnect a TLS socket and then run into all sort of unexpected corner cases. I have a vague recollection of Eric pointing this out to us a long time ago. Supporting disconnect is really hard, for one thing if offload is enabled we'd need to wait for all packets to be _acked_. Disconnect is not commonly used, disallow it.

The immediate problem syzbot run into is the warning in the strp, but that's just the easiest bug to trigger:

  WARNING: CPU: 0 PID: 5834 at net/tls/tls_strp.c:486 tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  RIP: 0010:tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486
  Call Trace:
   <TASK>
   tls_rx_rec_wait+0x280/0xa60 net/tls/tls_sw.c:1363
   tls_sw_recvmsg+0x85c/0x1c30 net/tls/tls_sw.c:2043
   inet6_recvmsg+0x2c9/0x730 net/ipv6/af_inet6.c:678
   sock_recvmsg_nosec net/socket.c:1023 [inline]
   sock_recvmsg+0x109/0x280 net/socket.c:1045
   __sys_recvfrom+0x202/0x380 net/socket.c:2237
Quoted 3 lines
Fixes 3c4d7559159b ("tls: kernel TLS support")
Reported-by [email protected]

Hi everyone.

This patch has broken a BPF selftest and as a result BPF CI:
* https://github.com/kernel-patches/bpf/actions/runs/14458537639
* https://github.com/kernel-patches/bpf/actions/runs/14457178732

Quoted 5 lines

The test in question is test_sockmap_ktls_disconnect_after_delete (tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c) [1].

Since the test is about disconnect use-case, and the patch disallows it, I assume it's appropriate to simply remove the test?

Ideally, yes. disconnect() implementation by its own nature error and race prone, I guess TLS adds some more spice to it. Unless there is a real end-user scenario behind it, removing the disconnect() implementation is by far the best option.

Still the test presence hints at some possible use-case[???]. Was it created using the plain tcp test cases as a template?

Thanks,

Paolo

#8 lore raw
In reply to Ihor Solodrai
Quoted 59 lines · Ihor Solodrai
Quoted 37 lines · Jakub Kicinski

syzbot discovered that it can disconnect a TLS socket and then

run into all sort of unexpected corner cases. I have a vague

recollection of Eric pointing this out to us a long time ago.

Supporting disconnect is really hard, for one thing if offload

is enabled we'd need to wait for all packets to be _acked_.

Disconnect is not commonly used, disallow it.

The immediate problem syzbot run into is the warning in the strp,

but that's just the easiest bug to trigger:

 WARNING: CPU: 0 PID: 5834 at net/tls/tls_strp.c:486 tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486

 RIP: 0010:tls_strp_msg_load+0x72e/0xa80 net/tls/tls_strp.c:486

 Call Trace:

 <TASK>

 tls_rx_rec_wait+0x280/0xa60 net/tls/tls_sw.c:1363

 tls_sw_recvmsg+0x85c/0x1c30 net/tls/tls_sw.c:2043

 inet6_recvmsg+0x2c9/0x730 net/ipv6/af_inet6.c:678

 sock_recvmsg_nosec net/socket.c:1023 [inline]

 sock_recvmsg+0x109/0x280 net/socket.c:1045

 __sys_recvfrom+0x202/0x380 net/socket.c:2237
Quoted 6 lines
Fixes 3c4d7559159b ("tls: kernel TLS support")
Reported-by [email protected]

Hi everyone.

This patch has broken a BPF selftest and as a result BPF CI:

* https://github.com/kernel-patches/bpf/actions/runs/14458537639

* https://github.com/kernel-patches/bpf/actions/runs/14457178732

The test in question is test_sockmap_ktls_disconnect_after_delete

(tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c) [1].

Quoted 43 lines

Since the test is about disconnect use-case, and the patch disallows

it, I assume it's appropriate to simply remove the test?

Please let me know. Thanks.

[1] https://web.git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/tree/tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c#n28

Quoted 34 lines
---
 net/tls/tls_main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index cb86b0bf9a53..a3ccb3135e51 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -852,6 +852,11 @@ static int tls_setsockopt(struct sock *sk, int level, int optname, return do_tls_setsockopt(sk, optname, optval, optlen);
}

+static int tls_disconnect(struct sock *sk, int flags)

+{
+ return -EOPNOTSUPP;
+}
+
struct tls_context *tls_ctx_create(struct sock *sk) {
struct inet_connection_sock *icsk = inet_csk(sk);

@@ -947,6 +952,7 @@ static void build_protos(struct proto prot[TLS_NUM_CONFIG][TLS_NUM_CONFIG],

prot[TLS_BASE][TLS_BASE] = *base; prot[TLS_BASE][TLS_BASE].setsockopt = tls_setsockopt; prot[TLS_BASE][TLS_BASE].getsockopt = tls_getsockopt;
+ prot[TLS_BASE][TLS_BASE].disconnect = tls_disconnect; prot[TLS_BASE][TLS_BASE].close = tls_sk_proto_close;

prot[TLS_SW][TLS_BASE] = prot[TLS_BASE][TLS_BASE];

The original selftest patch d1ba1204f2ee was to re-produce the endless loop fiexed by 4da6a196f93b.

sk->sk_prot->unhash

        tcp_bpf_unhash
            sk->sk_prot->unhash
                ...

It's try to use disconnect to trigger unhash handler. I believe we can remove it and use another selftest instead later.