From nobody Fri Oct 09 00:20:38 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 4j16vp6fJlz6Z1xr for ; Fri, 09 Oct 2026 00:20:38 +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 4j16vp4v0yz4LSK for ; Fri, 09 Oct 2026 00:20:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791505238; 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=wwYYsyguMcwdL36UByMRMnQP1luTqxASJOrTgj8xw7Q=; b=tW8bPszJrDlMEGEzM6ynaaOZbmIhnbcsmWf9+MNNC0KV0sowx7opArfJTY/yecuyPCAlNn 6glT1PWj/7k6lC5JHXhKPKcjmU4kU00diELXyULn1GOGvX53a/T52ipKBViQOezH0CpIH2 66YrFfHwlYB4EXmG5IEG7gGAQuH09XVy3GKpygs465Ul23GdLAkB32x7ohw5+Cn3LIiYuE Tnq1gsMXIiOSsMV8hBaMzTyz9s7B8L9hxzjBJ2UAyOQCAKuHpVVBdmmLzeNuuG2/15yXrc UyELKvrdgl3XRbPIDRYJvMA/d4jQ8RSPF4DKtj2B//6+oFUzDDClDRXyE3d7qg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791505238; b=Sv5sbwZWjTlJ4KbPecjQhfUZ6scfVzV/e7xU5PQN6nSrxYhAnbK62nPGSTNe4+EL+fAEvE 0Hm8e50vrLNyUrbZtkHNvbLYJaP8QncGQg+pA3cglXkMlaI0v7m6r3UeUCLM0JnFoPNjOQ +r4xE6SkXDeCUqMVWSPeX+rShSby8SbbpJkwE4FzYik/THbkx0ZgMtzoIQwjnXrxA1GMQJ AcrCX7S0GrBMDsdFXeX8kaOULmcTfon76NHwVuZNeYUnx2ToWk+T6L4MHGMoMKcOImcv8P M8WRC6y+/nOAEVwyzYKcv1fFsWCVGnCm1rl65JpVM5RCsFbfcsjT1OnMgshYhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791505238; 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=wwYYsyguMcwdL36UByMRMnQP1luTqxASJOrTgj8xw7Q=; b=XrB+PYzkaobQP/QH5eVR7MmP3KsRz9JJHGEEraZ04RkXQfEv6XEwdX11f3NGFwofpUOsb+ bV2eBveyPPpVetIKCgKccrZ53xGZZja24eunQ3621y/x41CdRg6FG9F/qs78iBp8mo08ig kQvOl+e8Z3P1OXJbCV1KFxHCe4dPfbukUiKu5EVu9QGzVjq0i3FS2ppTHxt+TljnLV0Qxg ZkDRf0vqcXb4D0fcafQ7e8y2uEi7Yi7S1qkPGXTMgG7y6YeEIbIAUehpBZQK2Mv7Od97bJ RAzdVjD2nsc7AiTHlABFcQ5t/fjm5pmH3TPOvY/NUF+yl5RGWixWZq4p6ju9AQ== 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 4j16vp3v2tz12qx for ; Fri, 09 Oct 2026 00:20:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 190be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Oct 2026 00:20:38 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: aa0edb002f51 - stable/14 - ktls CBC decrypt: Avoid creating zero length iovec entries 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aa0edb002f51fde3d81e26013cb497f2f26916ab Auto-Submitted: auto-generated Date: Fri, 09 Oct 2026 00:20:38 +0000 Message-Id: <6ac83356.190be.3400f6ca@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=aa0edb002f51fde3d81e26013cb497f2f26916ab commit aa0edb002f51fde3d81e26013cb497f2f26916ab Author: John Baldwin AuthorDate: 2026-06-30 18:11:29 +0000 Commit: John Baldwin CommitDate: 2026-10-08 18:33:09 +0000 ktls CBC decrypt: Avoid creating zero length iovec entries If an mbuf's length in the chain for an encrypted TLS record exactly matches the remaining length of header bytes to skip, skip the mbuf entirely rather than adding a zero-length iovec entry. Sponsored by: Chelsio Communications (cherry picked from commit 1756d1cab3ce28085eec94a45c557e1af265ccd0) --- sys/opencrypto/ktls_ocf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/opencrypto/ktls_ocf.c b/sys/opencrypto/ktls_ocf.c index 3c8b2e4f4589..64fa3f05941a 100644 --- a/sys/opencrypto/ktls_ocf.c +++ b/sys/opencrypto/ktls_ocf.c @@ -504,7 +504,7 @@ ktls_ocf_tls_cbc_decrypt(struct ktls_session *tls, iov[0].iov_len = sizeof(ad); skip = sizeof(*hdr) + AES_BLOCK_LEN; for (i = 1, n = m; n != NULL; n = n->m_next) { - if (n->m_len < skip) { + if (n->m_len <= skip) { skip -= n->m_len; continue; }