From nobody Tue Jun 30 18:26: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 4gqWp26Jz3z6jfj8 for ; Tue, 30 Jun 2026 18:27:06 +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 4gqWp25BmJz3jmX for ; Tue, 30 Jun 2026 18:27:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782844026; 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=ZVyw+PXUpRpVy3tEwUZHlAilX77ird1GX3hLc6WX+g4QO6JNRb0QNXYLnAjIGGPyaibFeM cy78KdSLrfriVDXw04WnWOnfXPf33WnejjJC26t4ic2brhYtKClULebOtYU5Ps+pRFe5KB oGw2jdnQUYGindfoM6u479mRgEZylPUldhgyqXABAeb0MGsVW2we/iBoh8hua+IXeUKQ/s jMNP8ZWa9qQj6SjZi271sAz/Vs1kMVhgNEHHixTNV7j9oFoDuiDNscIeteu7AKXU2m4u8p pgFECuDtKpYyC32auzAcbgRI0yjJEUjfenL7tLW6y78eH47sL8a5e12TvG6KFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782844026; a=rsa-sha256; cv=none; b=qC30NlcZCpwwYa3xNoOv5xuPT/hsmQIv39JsVX9NAAV5r6OGTgZ5FHG42f9+zt5wZK8vSr 36m0VHtqW8p8kgg69R5PScLqAsw845GwFUGzyzVza+CJjGoUqnYVLumweV6stmaunNQ1Zp TQ+jvU3oT9FhbE2km3xEUulbEy/v0R8apyO7iropP7WcaBaD/zzRlIkCgPaFFJcf2ewr38 igXZvvQpy/U/GljvJdguacOubhAwW3E/awLjmY83T0K7e4cucdpviMk1dFbwXbUgXd3Byl Jzn/swuYQ7PBX6lhCuMmRN8EsAM7SuWJJCq6iKAJiBrREfcS1ehTXgrTuUk+Mg== 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=1782844026; 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=w/fuRmcz/7ohFMi0K53Z9j6i11GSKMOCHjVMKYBZvT5FtGlp6jN/HRnVEfhsVkIt0JhvZE h8uIVhsQfoiYR148Nt44YXv4xfPAcgkn6U9gvxghH8USkhhSgIuuQX4+ZhpAeN9CHuHK8X I09Yqnj3atemF0132VJtY+ZDN7YIDBOdl9nnrgrpbFsVkYR6w19vQNOLwBhvGO6PVmZvIo Gq8yCelqJ2LxpsQC94TCHymCmVIODcWurEvBimZoBWo+SrVygDeltWSqdCJ/KOECV0EznE FMRKwB8Ks17A8Aq16wsbmLZmixFvONLlcMDjxsWRTtVQfhhHhCDx+YkuwZfaow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqWp247HCzwN2 for ; Tue, 30 Jun 2026 18:27:06 +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 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/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; }