From nobody Wed Sep 23 16:55:35 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 4hqjlJ3pBlz6tKgC for ; Wed, 23 Sep 2026 16:55:40 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hqjlJ34kFz4VGw for ; Wed, 23 Sep 2026 16:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790182540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7H96fyKnMD0El+Zp+XKhpaSlIaYCx+tWXBIUCCmnzQY=; b=n2LIOzsGdT6jAI57Zs1k+zY0Eylkj2bLs+lTw/Eu61fG+8hwWpphFY89WaTxvttFV3IMfN 4ijiA6D7EbLhdcZ7YUIVjUc8WjIFOzwE6M0GAMWKHaJaVoBy74DAQYgvYXpYBeM2lOHvqG 67ML3YQ+yMSQFLzfCdBw5Xmjffgct2oZBanovymbi9iJiAmB1AVuv/mm9e9RKQPmUAW8wT Uh6tbHhDz+Blak4tJ4/S/y8cZkfYYAhP7dZ11Xev5P2GxZJpErKxN2z+qrj3yabk55ExLe 7NQs4IOVW5l13AsDoDAVwgrTAZQ+V+i03wOsIAX7T5ATAA6KG820RAfLd5OKTQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790182540; b=iw+mv+VWgPfbN9YhUTT9ZwH4q3X7LGqodH34jTPBDySUupgI3gSPpFvx45tk/GZlZjFJTR BBaLhFzsUU1UTFNLwLvUclHmb4CboeSVS4fJ6NJAdBaZWNuMRpw7k/hRYuHtW6vZuunnWo cdxfVVDKWxWaGsw4+Oofrtg6cUAu75YltbL8LCnF6hfrH1lMNczNK2NyPENubwS8TVh0b7 9sWCndvefOCfDh4oadzBZPTNrnYivSO2nKjDeWtO4YPThsTBTiC7a069ZFLLrLgPyLwto/ fRvM92Znw+pA/2YgJjEqKxmWQe/DBmZw9yLB+cBVVUwEEE+2xNZBTWcKSz7DQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790182540; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7H96fyKnMD0El+Zp+XKhpaSlIaYCx+tWXBIUCCmnzQY=; b=WQhOlhj9jum2mXLQcFwswULVhit6Pcb2DjltbM7r07x792mHIA2PXVXqv/0wnJem9twS9n AMd53aVbUUXd39rspRcgf+4k5QRSSKtAa1dBYcsHn22+2Rkh7ug61IGUi7HiIldX2XoO0P 8xcU4CRU8qRT2K82mytlX7yToCXUJY9cTRuBzTDguQH6YY9rtHtbEMpOGDtg+kz/jwjEWD kzuEvvDAkH2xxhP1D+6JLhqUNSfP0/Xn2Qx8z0pysbppXiVquduBsDvic1Lu4VCZypil+q DwPldB6AsgBraN9LVvGa9G1acz4wkMSvwD9fLx/CNQkHk7upc+OkuVl76O97WQ== 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 4hqjlJ25Rrz12Lq for ; Wed, 23 Sep 2026 16:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e47b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 23 Sep 2026 16:55:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 7c5e457d3afd - main - ktls: Fix an off-by-one bug in tls13_find_record_type() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: 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/main X-Git-Reftype: branch X-Git-Commit: 7c5e457d3afdc7742ee24f0b5ee6e5e7aa00a6bd Auto-Submitted: auto-generated Date: Wed, 23 Sep 2026 16:55:35 +0000 Message-Id: <6ab40487.3e47b.39a5aa04@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=7c5e457d3afdc7742ee24f0b5ee6e5e7aa00a6bd commit 7c5e457d3afdc7742ee24f0b5ee6e5e7aa00a6bd Author: Mark Johnston AuthorDate: 2026-09-23 16:53:17 +0000 Commit: Mark Johnston CommitDate: 2026-09-23 16:53:17 +0000 ktls: Fix an off-by-one bug in tls13_find_record_type() If the entire plaintext is zero-filled, the backwards walk in tls13_find_record_type() would return the offset of the last byte of the TLS header. This causes an underflow when decrypting, resulting in a null pointer dereference. Fix the bug and add a regression test. Reviewed by: gallatin, jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D59767 --- sys/kern/uipc_ktls.c | 4 +-- tests/sys/kern/ktls_test.c | 71 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 68 insertions(+), 7 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 2cf6b5f1fa53..c1eb080b1455 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -2390,14 +2390,14 @@ tls13_find_record_type(struct ktls_session *tls, struct mbuf *m, int tls_len, m_len--; if (m_len > 0) { record_type = cp[m_len - 1]; - last_offset = offset + m_len; + last_offset = offset + m_len - 1; } } if (last_offset < tls->params.tls_hlen) return (EBADMSG); *record_typep = record_type; - *trailer_len = tls_len - last_offset + 1; + *trailer_len = tls_len - last_offset; return (0); } diff --git a/tests/sys/kern/ktls_test.c b/tests/sys/kern/ktls_test.c index d3a79aeb1470..7e9334c10144 100644 --- a/tests/sys/kern/ktls_test.c +++ b/tests/sys/kern/ktls_test.c @@ -2756,6 +2756,62 @@ ATF_TC_BODY(ktls_receive_##cipher_name##_bad_type, tc) \ auth_alg, minor) \ ATF_TP_ADD_TC(tp, ktls_receive_##cipher_name##_bad_type); +static void +test_ktls13_receive_no_content_type(const atf_tc_t *tc, struct tls_enable *en, + uint64_t seqno) +{ + char *outbuf; + size_t outbuf_cap, outbuf_len; + ssize_t rv; + int sockets[2]; + + ATF_REQUIRE_INTEQ(TLS_MINOR_VER_THREE, en->tls_vminor); + + outbuf_cap = tls_header_len(en) + tls_trailer_len(en); + outbuf = malloc(outbuf_cap); + + ATF_REQUIRE_MSG(open_sockets(tc, sockets), "failed to create sockets"); + + ATF_REQUIRE(setsockopt(sockets[0], IPPROTO_TCP, TCP_RXTLS_ENABLE, en, + sizeof(*en)) == 0); + check_tls_mode(tc, sockets[0], TCP_RXTLS_MODE); + + fd_set_blocking(sockets[0]); + fd_set_blocking(sockets[1]); + + outbuf_len = encrypt_tls_record(tc, en, 0 /* invalid content type */, + seqno, NULL, 0, outbuf, outbuf_cap, 0); + + rv = write(sockets[1], outbuf, outbuf_len); + ATF_REQUIRE_INTEQ((ssize_t)outbuf_len, rv); + + ktls_receive_tls_error(sockets[0], EBADMSG); + + free(outbuf); + + close_sockets_ignore_errors(sockets); +} + +#define GEN_RECEIVE_NO_CONTENT_TYPE_TEST(cipher_name, cipher_alg, \ + key_size, auth_alg, minor) \ +ATF_TC_WITHOUT_HEAD(ktls_receive_##cipher_name##_no_content_type); \ +ATF_TC_BODY(ktls_receive_##cipher_name##_no_content_type, tc) \ +{ \ + struct tls_enable en; \ + uint64_t seqno; \ + \ + ATF_REQUIRE_KTLS_RX(); \ + seqno = random(); \ + build_tls_enable(tc, cipher_alg, key_size, auth_alg, minor, \ + seqno, &en); \ + test_ktls13_receive_no_content_type(tc, &en, seqno); \ + free_tls_enable(&en); \ +} + +#define ADD_RECEIVE_NO_CONTENT_TYPE_TEST(cipher_name, cipher_alg, \ + key_size, auth_alg, minor) \ + ATF_TP_ADD_TC(tp, ktls_receive_##cipher_name##_no_content_type); + #define GEN_RECEIVE_TLS13_TESTS(cipher_name, cipher_alg, key_size, \ auth_alg, minor) \ GEN_RECEIVE_APP_DATA_TEST(cipher_name, cipher_alg, key_size, \ @@ -2763,7 +2819,9 @@ ATF_TC_BODY(ktls_receive_##cipher_name##_bad_type, tc) \ GEN_RECEIVE_APP_DATA_TEST(cipher_name, cipher_alg, key_size, \ auth_alg, minor, long_padded, 64 * 1024, 15) \ GEN_RECEIVE_BAD_TYPE_TEST(cipher_name, cipher_alg, key_size, \ - auth_alg, minor, 64) + auth_alg, minor, 64) \ + GEN_RECEIVE_NO_CONTENT_TYPE_TEST(cipher_name, cipher_alg, \ + key_size, auth_alg, minor) #define ADD_RECEIVE_TLS13_TESTS(cipher_name, cipher_alg, key_size, \ auth_alg, minor) \ @@ -2772,12 +2830,15 @@ ATF_TC_BODY(ktls_receive_##cipher_name##_bad_type, tc) \ ADD_RECEIVE_APP_DATA_TEST(cipher_name, cipher_alg, key_size, \ auth_alg, minor, long_padded) \ ADD_RECEIVE_BAD_TYPE_TEST(cipher_name, cipher_alg, key_size, \ - auth_alg, minor) + auth_alg, minor) \ + ADD_RECEIVE_NO_CONTENT_TYPE_TEST(cipher_name, cipher_alg, \ + key_size, auth_alg, minor) /* - * For TLS 1.3 cipher suites, run two additional receive tests which - * use add padding to each record. Also run a test that uses an - * invalid "outer" record type. + * For TLS 1.3 cipher suites, run two additional receive tests: two which add + * padding to each record, a test that uses an invalid "outer" record type, and + * a test that exercises handling of a payload with an invalid inner content + * type. */ TLS_13_TESTS(GEN_RECEIVE_TLS13_TESTS);