From nobody Thu Nov 12 19:15:39 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 4jQVTl5L1Rz716Fw for ; Thu, 12 Nov 2026 19:15:39 +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 4jQVTl3Hcgz4tW5 for ; Thu, 12 Nov 2026 19:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794510939; 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=Die1d7fQV333Vyfzgj038W4baHoeTokYf8VAaH+BUQo=; b=rQs3EE57vk7niCouRz8wWQ7E0algblj/GInF8nrfCdbE/8AzCo+5TvKz5XnQlwxTopb0vE v+gnJ5p3h735PtACFNMtbtC9a5569V17xVgn4bFmxeE56PF8wrGaMfPhQZh5hM1M8hgtOR 4sPQ4mssBwklSXx6U34tHigoHpU2dPPrnwCzWPwCSSddQ1roqOsf/1l0l7PULYFd/1EUHt XsSTfJqQ5qtxaSu8CHsXC8ZtZCvSSRbSxV/SpPJU4/xOS0/uO4OoNnt9eZKtbose/ufXwb XsMzPSVU7RmtTeOD6wS9BJfl4GOWr4osgzubIQmCmfvGxbKbVJZwBwsAA5/5ow== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794510939; b=idEL8gjzEA7/wPTbtWzhHwss+f5C/cDpq7bopm61sJ96nRWMAUf9tS8WhIG4cAMUqEEI22 fp+OovWsvKTRDdXAi6QGuSg7hfkNi9aMwuCJCib9IQfc/Vecn8Noqa+PzUuYBALMu6TYeR hGbDX7kNtdW3X3Vsm1pWCiL2JjZqwWSm1hU+O+A/dme3ibYocLXiuddaCQ+PxZ7ph/xrU1 JBGlB9gxNqKoyFyC0zoIu+zmEVnfhhpiRxOO4vy5S/XEIoOaXmSBsPr825ycZO9BbfvmTb OLFIu0Ov3e/iSZsmqV5Gcm2RzPPCRn918cRaSqfS9s1HhHZ7b+WATiI5PbRDlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794510939; 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=Die1d7fQV333Vyfzgj038W4baHoeTokYf8VAaH+BUQo=; b=drzqdpI2L12BLp+xcgh2v9hSFKqEqB4mQr29BSlbTpYNF7+U0cIg0DQiS6F/IC3iGPV4iM fuJX1t40CEyNZtSymIHdp0W22HiD9781C6qv3KqJRKu4CAU4WKjkleWrVprLqN00REXFeH mTExMBYEK6S0FXdr6Gmh48Hyz+ZuBK7NcESb+xESkXyJcm2Was8fca5/CmRqlSdHiBKvn8 WE1ksVApd3aCauTBSU7Oi1nlM+c3dnyFowtEGBDAniDTRAltu09u1Bj00y2DXFL5nybF/2 1C6Bfs1FTzs3R3qR0ODbMHQZiWfNDMAOjqgy1GNsyM1alGcuOIQ9eD1QbRnmRg== 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 4jQVTl2gL2z1FNY for ; Thu, 12 Nov 2026 19:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 14b45 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Nov 2026 19:15:39 +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: 42e7802e24fe - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 42e7802e24fefd1cef6913ab162cda2c7bdc477f Auto-Submitted: auto-generated Date: Thu, 12 Nov 2026 19:15:39 +0000 Message-Id: <6af6105b.14b45.1942342a@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=42e7802e24fefd1cef6913ab162cda2c7bdc477f commit 42e7802e24fefd1cef6913ab162cda2c7bdc477f Author: Olivier Cochard AuthorDate: 2026-10-16 16:43:30 +0000 Commit: Mark Johnston CommitDate: 2026-11-12 19:15:13 +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: markj Fixes: b2e60773c6b0 ("Add kernel-side support for in-kernel TLS.") Sponsored by: Netflix (cherry picked from commit bd4975e5fb051c2b2e8d5218940b7e8ef87b5bdf) --- 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 11d7e794da00..d31d91d9ef91 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -2386,7 +2386,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 7e9334c10144..11275ffc9e49 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);