From nobody Fri Oct 16 04:40:10 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 4j5XL76w65z6vt3F for ; Fri, 16 Oct 2026 04:40:15 +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 4j5XL72j9Cz3D9f for ; Fri, 16 Oct 2026 04:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792125615; 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=4MF9MBHlGx+WvaiCsmjZ5jaDuhCFOmiHqks9rcK+4EU=; b=jL8MZTMR3XKUnoXr1T8hdbxFzUAeqFDVK2Pda3Wt1/7ESZoIHHJ7AElA0P4DO4JWUNxbX3 D1ePJmnmYF8kxFFaQL9IwAwDlzVatHul56fLZk+mLSlbVTkFcPB9KMAVcq4j98Hqkeldeh U4+tzpEiL0SedbTQyYRDuDK0Ft6aWrb+uXFziI7hKfYWDoT/Jc1xLnXc/2ZQ8XfPYFhmy3 l2s5PjBAD0EHtMETduc1oNlCHLSAPm2Ltqu/V/lsAK9sTA69L7dKbbYLsdTkHSz0eLn1// HExRnBtpp+ck4DRsW27D7xtat24aZxdbBsIvU01oxFNQnk+gj+eDVIwMqIncyA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792125615; b=E72+PYnq/ukWL8b4sRhjD/2eG/KXobptNHJsA7eHN7l6rR1sQCi4+EiBUnbUSENYdJjhJ6 1Fc6hwNlmcaQpWl12dSR+7bvn7qqylEWgnE+zSoljq2vMdCvc5q4BLxaOSqZBfgKxGFRJe zrgM5HzgApV4kcQ0ohzGuT3gnB+CMb07JCzcp7DCoUnV8yFU+p/IzFw33pg1fMhoSkMtaG EEEpEZWhCGaZkBLhJq+PwXA9c+tT1Xc+bQABOgCR6U/j9UyKqeRug8k/Jnkqzwcp+Er7yN 6jvG+4trL/tKRcuCAFTUznnmMs4X8ESvr/l+i2rMd7iFlpl3wNtKmoK6+PfTBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792125615; 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=4MF9MBHlGx+WvaiCsmjZ5jaDuhCFOmiHqks9rcK+4EU=; b=xqJd4ymfF/uTScrJnLdGPH7ddrYVnUX9QO9EibvjsBIHVQTYlohGPei1/NQGCklE2K3NuS 2KfJYqMLYY3E8QRxgxVPXuZUPTkJfgnhZ84+t4ckgk4pAF/27UNzHgkP/F2TJU8OzzDpUk cPQCeui9AHI+xfYXCf4vC4Ej3g4skwBZMo9doz9ESAWEb9zGTpbkQp97JGoZOj120yfbiW ovyeZgPTcIrg7SUeqfS5vR875+R5S57omqcBSFjmjyaQr64YhW2COCeErGgDHhsub51GO+ g02R/6ibkl4DlySa/wQZORPoBZ4r8h1kOhNNhcGkFbNzd+OZX1RipQnxsOGQvA== 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 4j5XL70jJBz14Xh for ; Fri, 16 Oct 2026 04:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cf70 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Oct 2026 04:40:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: c9599b80015a - main - ktls: Take the receiving interface of each packet in sbappend_ktls_rx() 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: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9599b80015a50e66c907dc667334a53bc234dab Auto-Submitted: auto-generated Date: Fri, 16 Oct 2026 04:40:10 +0000 Message-Id: <6ad1aaaa.3cf70.bfd9dd0@gitrepo.freebsd.org> The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=c9599b80015a50e66c907dc667334a53bc234dab commit c9599b80015a50e66c907dc667334a53bc234dab Author: Olivier Cochard AuthorDate: 2026-10-16 04:32:29 +0000 Commit: Olivier Cochard CommitDate: 2026-10-16 04:35:39 +0000 ktls: Take the receiving interface of each packet in sbappend_ktls_rx() sbappend_ktls_rx() read the receiving interface of each packet header it demotes from the chain's first mbuf, whose header it had zeroed on the first pass. A chain of two packets or more thus had no interface, and a change of input interface went unnoticed: the TLS receive tag stayed on the old interface until a later append of one packet. Read it from the packet being demoted, as the decrypted mark is. Fixes: fe8c78f0d202 ("ktls: Add full support for TLS RX offloading via network interface.") Approved by: gallatin Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D60758 --- sys/kern/uipc_sockbuf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 745702bd4a4f..d69fe5bf66c6 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -1008,7 +1008,7 @@ sbappend_ktls_rx(struct sockbuf *sb, struct mbuf *m) /* Remove all packet headers and mbuf tags to get a pure data chain. */ for (n = m; n != NULL; n = n->m_next) { if (n->m_flags & M_PKTHDR) { - ifp = m->m_pkthdr.leaf_rcvif; + ifp = n->m_pkthdr.leaf_rcvif; if ((n->m_pkthdr.csum_flags & CSUM_TLS_MASK) == CSUM_TLS_DECRYPTED) { /* Mark all mbufs in this packet decrypted. */