From nobody Fri Oct 16 04:40:10 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 4j5XL23XQTz6vtNS for ; Fri, 16 Oct 2026 04:40:10 +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 4j5XL21JLHz3Cyh for ; Fri, 16 Oct 2026 04:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792125610; 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=FQT/TSFvI6l3AtMI7/tFz3VPXhQ5wimd1Q62ySg3asBprDMfUFvz++B7IqmabvKCicXSj6 VJXPftyaaQ8HnUU20oDd2b7ko+jtd/o6LaT3X3envYXbh9TMM5vcd9xp3A0iDIF27Sn2Gc GkQ4fTmLJH2ASjH/NnwtLHdTeZVbR4MrgLfLuacghI4wYThFIu15XutX3Io6ohHTZG27ly cgA3tPxtHyF5Ntbsqo6PnIpIa5mOkjS0ipIfQcTmJBufRSB8jAb7v2bWh3wIARC/ckUI/R jADOd7x7tfxItLG3WKYmVru8k2pqE0NTLgyc4aBclgXM2t4fJbw6wJgc/BxiMg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792125610; b=GkpC0RYIpCvtkS7owGQGr3IJSCBmz157etS0CWRMILEGMxzOIG8427uKTcWvHVGCbQNzgq MSU8V2+F8enRd6XjWConurtMs+deslMSiOUIqJqZbMlwZKjp5Q0At+xQcEqnMgHFH9Fa4a 88nUg0qpNUFnYSK3Bbr05tT3K/qEhEqKveO6HFzIb0r4a1K1+A2GHZ/qEEmM5wmAO5KTL6 XdQkIActpWtcz3kMj2wguBXhIkrxOk4u1Eo9FTViFZZFNEXzm33+VdITBcMsJkFT+yRgrv AmHeuSUh7hxgqB8IZlfFJ/XwidoUA8Aaxe8ZKkafSw1vJU1Y9rbTZwm2eV46MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792125610; 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=iHqlbpghf0A1a9FfLETfhMc7936xr6S0guT24ikJCXNpAaqGPqdezvFCbhgltjwm3Htau2 ugJ/+GoXaBQhVH0UBMjuJ1Jly2YxFY0hgQ9o12FEqrCNGd8OL4jgPtyO3I8aphOAF607T9 3MZ+lBBiK6bOtEhjilq91IKHmX+4nC23Uu+PVY7egapGfdk5UOTeYyWia0LFjotEOFKIlH m4JOHCasg+vjc2Rcmt6T89u6X3j7QU/q3JzEMGYZDUyAbVO/to61y1zZs90gLN3vRsjJW8 a22hu3Ct4/TdB/XIjOQ0/eANFKYepYjaFOqj1/KtqBRcJk6xvxMrCXyxbVsuTA== 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 4j5XL209pCz14Mt for ; Fri, 16 Oct 2026 04:40:10 +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-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch 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. */