Date: Tue, 14 Jul 2026 14:56:15 +0000 From: Mark Johnston <markj@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 60585ee63af6 - stable/14 - so_splice: Fix the KTLS check for the sink socket in so_splice() Message-ID: <6a564e0f.3e1ba.53a21d51@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=60585ee63af6c738bdcc0261da57192a547bfbf6 commit 60585ee63af6c738bdcc0261da57192a547bfbf6 Author: Mark Johnston <markj@FreeBSD.org> AuthorDate: 2026-04-16 19:57:36 +0000 Commit: Mark Johnston <markj@FreeBSD.org> CommitDate: 2026-07-14 14:08:40 +0000 so_splice: Fix the KTLS check for the sink socket in so_splice() 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) --- 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 2e7bf0b5e5fa..515f038b78fa 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1707,7 +1707,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); so_unsplice(so, false);home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a564e0f.3e1ba.53a21d51>