From nobody Thu Oct 08 20:43:51 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 4j125g61mmz6wCk0 for ; Thu, 08 Oct 2026 20:43:51 +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 4j125g2tHkz4bfB for ; Thu, 08 Oct 2026 20:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492231; 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=HCO2NeQc0tT2bAzFVp3nGBNPbS5ik+JYAkBRtksV774=; b=VYZY8l01lvpSYEiTRM6Cczp8b4EkvlWMyqm9wyeOCTuy51nPIgxH7l6RGy0NUyF9G8SNK8 mE43TgW26F3iLOcobxZ9kU6aCtbDGi5t/4PgQKYWdS8P+yWPXB4FPUYtWDg+i7u53eIMG3 meceie+q1QHMFSoboXsXvDZB5Kh6TMtKN6IPe9DqAlgkUSdiN6bN38BgVHSukOJ1cyX6oG 6+poEKA8ouS+RW62wAoSUDYhS8LQ4W1514CoayXSWC+1uYEMCX0nYeegZ+qm4haVMF6dc8 xJCtOboltEqIktmd/pDeH4cQXAP91w0qhBr2fqDsdfn3nF04OfaKbnu33QzYlg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791492231; b=OwsZTxFt78lNakycMleU2lmvHRRtT2s5lTUnL9utGmnT1IrNq2vrj2/m0Hqf35j9s7HxJI gFQjOsCJWecjOqFD4ktG+y05aUEVQQAt6U32rNSMZIYFUZy2Q1Ma7nRzeojD3yXHXIW95R VrDMWPrlf74VnL1ZAWH364DmXOqe+bMAgfDr6R1PYkHo5dcapKzKe02JmUgmPbAZod8NYE ZrsXElXdP/bVP3RicDy39W03Nw9Bf4Zx3EyGfbvT13iBfuj5xr2pWFDt27n/NNJ9mAN/tA csjIrYnaW0+QrUh9loIMbkp+t+vftSfefUyEP0e0JVjybZFWDKXXY0FBoPSj6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791492231; 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=HCO2NeQc0tT2bAzFVp3nGBNPbS5ik+JYAkBRtksV774=; b=vpQxziQDaP5lQPzzRxq0sERTFY2g/1Wj3c6CnJy/THgCxikQAGSEa3Xep/3fYwcgNXOPHK jC4MO32yV/o5n8oZtoeHCNvctZTsW3TwumWwmRoTL4KA0KVj5g3wNWfMs8a64eEH2Bxgrz gWIaaymxE56mgYMwYHyYC/32pfvJ3UAksQ5PpqEY59Rds0tGwnZWxvcrMiSzP+byu/R0cO rbGQKT+TtmTlrMsMFhTPo/cDf9rUF1L/wZeRrvHVwyNHAGO8GH8ntE4ZlHknTOPOTyyWcv fIsPjM2wGXvB4b+wb75LH7r64U5GgdRB/TUzW5sKALylHmeAttmMTgicPSSJDQ== 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 4j125g1wd0zwDy for ; Thu, 08 Oct 2026 20:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33116 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 08 Oct 2026 20:43:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 8eeba7ea1f96 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 8eeba7ea1f965160cd759a2296eb53aa7a4c4770 Auto-Submitted: auto-generated Date: Thu, 08 Oct 2026 20:43:51 +0000 Message-Id: <6ac80087.33116.776c11b5@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=8eeba7ea1f965160cd759a2296eb53aa7a4c4770 commit 8eeba7ea1f965160cd759a2296eb53aa7a4c4770 Author: John Baldwin AuthorDate: 2026-06-30 18:11:29 +0000 Commit: John Baldwin CommitDate: 2026-10-08 20:42:31 +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 e61f607622b0..792b08650deb 100644 --- a/sys/opencrypto/ktls_ocf.c +++ b/sys/opencrypto/ktls_ocf.c @@ -501,7 +501,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; }