From nobody Tue Jun 30 18:26:51 2026 X-Original-To: dev-commits-src-main@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 4gqWnl49vwz6jfsS for ; Tue, 30 Jun 2026 18:26: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gqWnl34xpz3jK6 for ; Tue, 30 Jun 2026 18:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782844011; 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=OWW7ny13XIzHdZudCbq887jHogkOng0D8Q7BGBSY65o=; b=tR9rzb16sK4f73McphQXpD/E6f4WCQt3/jTk4eFkrkFwvFYOQZ0LhfaKjwOPmQphznT/4d BzMBf2YUgR4bufEWrwk+OCMoeMuOcR4PFaHb76imB21raMW2QM/5AjmAlVwYu+Ob4rtaBt 4FvUNn6X6OA53I4ecT08IzqGBWzwggFfdQG063rqUuKnf5HjFvlBeIl8zfSvkLHW/wc9jJ 9ark8y8k27/r1O3CnT64owpubYC2gOWQNNd6m1e+IIo/4XQoTyHDSCneU3fiRSOq8Vokwe HN3n/376NWlf8jU4kRk1u5Y3ppxprLPkc1yX3dG4nnkETdTU5ridbWOEurP91A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782844011; a=rsa-sha256; cv=none; b=Qfbv8tFmoECQwVA10fHpHJRBKkHMAW9Kt+YRqrmKOPAjZ0V1CNPLs5yfjBAOfqeGlfqwgk vhcj18Dl+6jeEUnh2LR4ZkvZe3w5uvTEkdQogCA8cTpM1A9RKoQg2rdduy2xG6/zGCUoyZ N4mJJ0ikvlokmBim0/oYUGgSQsgU+bfptL6nLKGl7Ai2lIsdLRSg1fVRG6b2lJCVr9xBAo x2WEHm1A/xEyTK/lbPblDqTbOY6X5xhFkUnopvg/s4Z+thMX18heHFJ5EkB4KSzxQPplj9 RivTW/Uc2yMSLLq1DQ5RqV0L4gDfUdNOgCnsVv74i5BOQtTdUH814od9uG00MQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782844011; 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=OWW7ny13XIzHdZudCbq887jHogkOng0D8Q7BGBSY65o=; b=KhRaHWlgczzlAgvWWDPN3s/gfnU2RyQEVxoZNVtV4i9hvcoui3kfMAPXL4NgX87vUpE6/H Ba0y5QwrzdG9dEJkP3vDrwXVBGwfNepIMCrX72I2xYnHAnMaDs28ylq5xzlwfOWU0TpBIO QDvf4iuDeUfKQJ0ccvQ1K6ctpjdm8y/ATrvtheyjZO91Q0J1HW3NFP36RJNezR3O9LlWH9 IhooGVOl/zqYH7YkZhA8ao/cSXJoTw2fKwD867678fcR2eV9tM9iFGUKOOeR1/ijZYI3N5 FG0gvW9PzHPKzUiyHakhp6zAEnmzGQyxU/E1n9jJkiSg/70ayNzoYS/VBCXasA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqWnl1byQzvlc for ; Tue, 30 Jun 2026 18:26:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d883 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 18:26:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 1756d1cab3ce - main - ktls CBC decrypt: Avoid creating zero length iovec entries List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1756d1cab3ce28085eec94a45c557e1af265ccd0 Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 18:26:51 +0000 Message-Id: <6a440a6b.1d883.60b376ff@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1756d1cab3ce28085eec94a45c557e1af265ccd0 commit 1756d1cab3ce28085eec94a45c557e1af265ccd0 Author: John Baldwin AuthorDate: 2026-06-30 18:11:29 +0000 Commit: John Baldwin CommitDate: 2026-06-30 18:11:29 +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 --- 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 87cbf0bd3311..81e130258747 100644 --- a/sys/opencrypto/ktls_ocf.c +++ b/sys/opencrypto/ktls_ocf.c @@ -500,7 +500,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; }