From nobody Tue Nov 17 17:05:02 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jTWLl0NqQz71RFF for ; Tue, 17 Nov 2026 17:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWLk3zWwz4Gjj for ; Tue, 17 Nov 2026 17:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNkKlQN4YoBzqu9+qAIR7RC45+bVeoJkxEsNYzytBSE=; b=QLJ6bh0JOrKF6lamae3KVcLKS5HwK09OcSZzroQ9dne5/Al6NbC/nm+VyLyxfq/4T4SEig swkVCaSiZ+hBxUQt3ppR9I6UVNPW1shCGkUmYDIN29Y4zbrHd057bZ5IUS4NUbvSJl44ea y/buAb4qGPM8c1Sf7tKmORwqX6Ei+/wv9DE4CTMamVXfMIWJDMxXXctiyWFeF+qGptRDfv sOrhHuv0Sb06h2cdXmQDHV4EfwGSQ56UxTHKbZaVXdUXkFtcUadIbFzmUtLwmmYQVeeavT bUv1XAUn7iLwP8wVc4ySJk5viSyAy4eqa5Fs2cnR9KIvbSeGMy/Le1vjrzFcnw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935102; b=MW5r+s92viE7ROd3ent9juRXOmGf4+6DWobBAxuiZH77s1p72amEl7G/BiZnxaiJ1pft3L 3fdhzUvRKE7RQfDZ1vOZ6Eh4EaJp0sUrkuVU8qDCIVRX7X6EDCJtxoS6BLiyAK+wwREihw UkU5+W5gZRMl774s4ZlZxccqoUMISCgzUL9Xt6jEZ9VQLheonsihdfDCh20g3amOmLIv5u 6EE2w8JCcoWHk2cvzEzgi7O/hI53hjEGgwKLHWldMugLtPDgLYU0Yizi2TYXoXKaqK/cU8 wIoViAglJryYCeq1XBFIO67pvxVQY0Vs8kXPm/cSIopPh/HIYC7/x16DLIZkZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935102; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NNkKlQN4YoBzqu9+qAIR7RC45+bVeoJkxEsNYzytBSE=; b=PjxYhGnF/FW4+aiCBu1R7ILhmA11AJ4ap3cw7Cz3Tx2trBzgsIU7luFCHn7whXqp4Xzcze VlhIQzSzNZME2TPvMe4Zn/gRlz1u1SY/yMnhurfOL+2FIdY71kSfxQFkB+ol0Imw+4xyqF UWxlbsmAvQxQXaTWyqI5Knlmr44rrJq9r8KmMMOXKdbb8sWAIiSWRG6974JalIbK4kLtnD SNu4P9TbRuXaO7ZmIQjnG/BLsf5lhZ+EXbPh04saFFA9z1ZXwygy5/U/2D0IfQv4ieCdPY +hUuKQCLaZrZoTbBhozPxlntJat4aOYUWMq51DsgVT5kJmBw8kxxd6wWnzpAIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWLk2vqmzr92 for ; Tue, 17 Nov 2026 17:05:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e4cc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:05:02 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Cochard From: Mark Johnston Subject: git: ffb23d0f6c67 - releng/14.5 - ktls: Check the record type message holds its byte List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.5 X-Git-Reftype: branch X-Git-Commit: ffb23d0f6c67bcab62b97e4e6db5b285ea1cd1cc Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:05:02 +0000 Message-Id: <6afc893e.1e4cc.70fd71f2@gitrepo.freebsd.org> The branch releng/14.5 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ffb23d0f6c67bcab62b97e4e6db5b285ea1cd1cc commit ffb23d0f6c67bcab62b97e4e6db5b285ea1cd1cc Author: Olivier Cochard AuthorDate: 2026-10-16 16:43:30 +0000 Commit: Mark Johnston CommitDate: 2026-11-15 15:40:33 +0000 ktls: Check the record type message holds its byte sosend_generic() read the TLS record type past a TLS_SET_RECORD_TYPE control message holding only a cmsghdr, and sent that stale byte. Approved by: so Security: FreeBSD-SA-26:74.ktls Security: CVE-2026-101313 Approved by: markj Fixes: b2e60773c6b0 ("Add kernel-side support for in-kernel TLS.") Sponsored by: Netflix (cherry picked from commit bd4975e5fb051c2b2e8d5218940b7e8ef87b5bdf) (cherry picked from commit f279c33cef3cd42b60f876e760773d8eed2e27fd) --- sys/kern/uipc_socket.c | 2 +- tests/sys/kern/ktls_test.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index c9691d351a58..2c7467e6f4db 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2315,7 +2315,7 @@ sosend_generic_locked(struct socket *so, struct sockaddr *addr, struct uio *uio, if (control != NULL) { struct cmsghdr *cm = mtod(control, struct cmsghdr *); - if (clen >= sizeof(*cm) && + if (clen >= CMSG_LEN(sizeof(tls_rtype)) && cm->cmsg_type == TLS_SET_RECORD_TYPE) { tls_rtype = *((uint8_t *)CMSG_DATA(cm)); clen = 0; diff --git a/tests/sys/kern/ktls_test.c b/tests/sys/kern/ktls_test.c index ffc976aab407..6c3aa29f47b8 100644 --- a/tests/sys/kern/ktls_test.c +++ b/tests/sys/kern/ktls_test.c @@ -2960,6 +2960,48 @@ ATF_TC_BODY(ktls_sendto_baddst, tc) ATF_REQUIRE(close(s) == 0); } +/* + * A TLS_SET_RECORD_TYPE control message without its record type byte + * is refused. + */ +ATF_TC_WITHOUT_HEAD(ktls_transmit_short_record_type); +ATF_TC_BODY(ktls_transmit_short_record_type, tc) +{ + struct tls_enable en; + struct msghdr msg; + struct cmsghdr *cmsg; + struct iovec iov; + char cbuf[CMSG_SPACE(0)]; + char data; + int sockets[2]; + + ATF_REQUIRE_KTLS(); + build_tls_enable(tc, CRYPTO_AES_NIST_GCM_16, 128 / 8, 0, + TLS_MINOR_VER_TWO, (uint64_t)random(), &en); + ATF_REQUIRE_MSG(open_sockets(tc, sockets), "failed to create sockets"); + ATF_REQUIRE(setsockopt(sockets[1], IPPROTO_TCP, TCP_TXTLS_ENABLE, &en, + sizeof(en)) == 0); + fd_set_blocking(sockets[1]); + + memset(&msg, 0, sizeof(msg)); + memset(cbuf, 0, sizeof(cbuf)); + msg.msg_control = cbuf; + msg.msg_controllen = CMSG_LEN(0); + cmsg = CMSG_FIRSTHDR(&msg); + cmsg->cmsg_level = IPPROTO_TCP; + cmsg->cmsg_type = TLS_SET_RECORD_TYPE; + cmsg->cmsg_len = CMSG_LEN(0); + data = 0; + iov.iov_base = &data; + iov.iov_len = sizeof(data); + msg.msg_iov = &iov; + msg.msg_iovlen = 1; + ATF_REQUIRE_ERRNO(EINVAL, sendmsg(sockets[1], &msg, 0) == -1); + + close_sockets(sockets); + free_tls_enable(&en); +} + /* * Make sure that listen(2) returns an error for KTLS-enabled sockets, and * verify that an attempt to enable KTLS on a listening socket fails. @@ -3126,6 +3168,7 @@ ATF_TP_ADD_TCS(tp) /* Miscellaneous */ ATF_TP_ADD_TC(tp, ktls_sendto_baddst); + ATF_TP_ADD_TC(tp, ktls_transmit_short_record_type); ATF_TP_ADD_TC(tp, ktls_listening_socket_tx); ATF_TP_ADD_TC(tp, ktls_listening_socket_rx); ATF_TP_ADD_TC(tp, ktls_receive_loopback_sendfile);