From nobody Fri Oct 30 17:40:30 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 4jGSzy2nJHz6xGMy for ; Fri, 30 Oct 2026 17:40:30 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGSzy0pClz4gbT for ; Fri, 30 Oct 2026 17:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/vZkpv8wKRm14F4AHyGJCUN3M19bbbiXi6rbc8zGbQ=; b=ny+1LTYc29mHSiI8cuDxh9GbS53tFOwHIKQ7s+mjbtSBXo3+nGzPqoLJF8cqJE0NLcZGzJ uCN7wNuy9+PT8ilrD+QJxykoqIEYg/sinPLc+RXm1/umRrTJC4cHiG7jkNyIU+/9fDSnYQ vhgSQA99Gkl3wMQduBe/gz2AdLu+b9cY5DIEnOA3gcbDViesyd2D+TEhI/ia59eyVaNExR gjBTlgjMEG6kK/FKv75LVX9yjyn8SsOmmgkAjC9iKlvnqML5QoUVGUQFYDYOjNIz1/Rrae R8k7w4ULDXUrppxu4sVIGT3+bGBhsLVfjM5XM40jdOaqoAcaF3kSEKXAgrZvEg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793382030; b=ozD9S//uP7nvY/qbo+6JrexilT1SA9Yu9PW8KR50AcboRX/M5kjbdSdkL9SLQkzljRHnlH ckJ47fRbkSqAf7XtBMl/nv5KWZIMTnlNkZsTYs4rttQj7G96KBXBdBi39yQy7v09WoEWm/ Wq0giQbCCw2XRAuQve2EyKKx5RMAhXuYU3nJ2w52AxV8zXjTpVIG2DWByQtAf2zwyEw1Tu /pIm4OKTMwB3opHxLm8OkIYVrXWu7waGTKkTWNQgGOGc6vtvBv97AoAmtvJNhVlxw10v+a dWDpbk7RL5zK+dS/WKBhVvy6eVhaG9d8En3IpoA61rz4j2xUAMwZ6TS+FqmIhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382030; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/vZkpv8wKRm14F4AHyGJCUN3M19bbbiXi6rbc8zGbQ=; b=blQ4kMb1o7mCR47Ldr3ue4Pt+prJFdPT9oXSOQeVeK6lbfcUlWLpzCkMp4XMNbPia/j3wc zcOcoyXkJ1jkDHQgCYozi7tNh53CWD38x4Qg9MLcdYd3Z7v5rkQPirI61QjQHDKujrizof 8fJqBWQ1EO4aSmnQ8yVsiWXG+4b8Zf2vJyiziyioq8w8lI3tyoQcT1cmhAl6+5HUDD6qiY x2nDRmXAlaM4aVwolnfV2do3dtBYEjxsqq6/JweoyGCs6cqfSazmbMbJC3nxcwc0AdyuTK beYRrOws59R2+Y9JomZrZXcnBM5YCtHFgXHtV3oXKmBWTBDdukYk4qoE9501gg== 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 4jGSzy0Mm9zdrR for ; Fri, 30 Oct 2026 17:40:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41298 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 17:40:30 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Olivier Cochard From: Kevin Bowling Subject: git: d3eedbcb799d - stable/15 - ktls: Fix capability checks in ktls_reset_receive_tag() List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d3eedbcb799ded5d7aa811558f7d73de3c6fcb23 Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 17:40:30 +0000 Message-Id: <6ae4d68e.41298.271933e1@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=d3eedbcb799ded5d7aa811558f7d73de3c6fcb23 commit d3eedbcb799ded5d7aa811558f7d73de3c6fcb23 Author: Olivier Cochard AuthorDate: 2026-10-16 04:40:03 +0000 Commit: Kevin Bowling CommitDate: 2026-10-30 17:40:18 +0000 ktls: Fix capability checks in ktls_reset_receive_tag() IFCAP2_RXTLS4 and IFCAP2_RXTLS6 are bit numbers, not masks, so ktls_reset_receive_tag() tested if_capenable2 against 0 for IPv4 and against the RXTLS4 bit for IPv6. An IPv4 connection with NIC receive TLS offload thus never got a new receive tag after its packets moved to another interface, and fell back to software decryption for good. c721694 fixed the same checks in ktls_alloc_rcv_tag(); use IFCAP2_BIT() here as well. Fixes: fe8c78f ("ktls: Add full support for TLS RX offloading via network interface.") Approved by: gallatin, kib Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D60757 (cherry picked from commit 32a981471c0147ea494745477434807cf8b6dadb) --- sys/kern/uipc_ktls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c index 4ba4bf44dcd2..255277134777 100644 --- a/sys/kern/uipc_ktls.c +++ b/sys/kern/uipc_ktls.c @@ -1731,10 +1731,10 @@ ktls_reset_receive_tag(void *context, int pending) INP_RUNLOCK(inp); if (inp->inp_vflag & INP_IPV6) { - if ((if_getcapenable2(ifp) & IFCAP2_RXTLS6) == 0) + if ((if_getcapenable2(ifp) & IFCAP2_BIT(IFCAP2_RXTLS6)) == 0) goto out; } else { - if ((if_getcapenable2(ifp) & IFCAP2_RXTLS4) == 0) + if ((if_getcapenable2(ifp) & IFCAP2_BIT(IFCAP2_RXTLS4)) == 0) goto out; }