git: c27fea568635 - releng/14.4 - so_splice: Fix the KTLS check for the sink socket in so_splice()
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Nov 2026 17:04:18 UTC
The branch releng/14.4 has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=c27fea568635032877ef43a3aabf5458632b0750
commit c27fea568635032877ef43a3aabf5458632b0750
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2026-04-16 19:57:36 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2026-11-16 21:16:22 +0000
so_splice: Fix the KTLS check for the sink socket in so_splice()
Approved by: so
Security: FreeBSD-SA-26:87.socket
Reviewed by: gallatin
Reported by: Claude Sonnet 4.6
Fixes: 1000cc4a0d39 ("so_splice: Disallow splicing with KTLS-enabled sockets")
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D56385
(cherry picked from commit d88a159da42a75dbd46ea4f6f9c8059975dab5e8)
(cherry picked from commit 60585ee63af6c738bdcc0261da57192a547bfbf6)
---
sys/kern/uipc_socket.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index c90fe0196aa8..14b2eeccc043 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1709,7 +1709,7 @@ so_splice(struct socket *so, struct socket *so2, struct splice *splice)
return (error);
}
SOCK_SENDBUF_LOCK(so2);
- if (so->so_snd.sb_tls_info != NULL) {
+ if (so2->so_snd.sb_tls_info != NULL) {
SOCK_SENDBUF_UNLOCK(so2);
SOCK_UNLOCK(so2);
mtx_lock(&sp->mtx);