From nobody Fri Oct 30 17:40:28 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 4jGSzx1qKTz6xGQH for ; Fri, 30 Oct 2026 17:40:29 +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 4jGSzw71gdz4gNK for ; Fri, 30 Oct 2026 17:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382029; 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=c+4QPgPXoxgaNXqDeM88KBkTitCbkZ51Gn3kyvzT0HI=; b=wFzsbwXfbFm63r4o+d9BF2F5IKtR6E04jUa0EQ34B6npD1mU2E/VYf2y1KbL71i0jqoMAy +oOfNVk3uj4P6vWNFu5JUbBZbFc/5qwyfwnQPM1t4omWRe9UJVMtKOIzlyIRqd3fNUOZQb 4GPOjwnXwLMkSlEi7hWnEdWeKYyM761tR4dOrjUJ26bh/YGG9vrSK/+FbMXwLb3+jC4GKd wqSgNJJ+GPi/NOUiglmLSCBtjhwAJlFHCQvmmlAd0KrXjb1LhtV4KmVHPaJCSIm6woQ+3i N9ovJ1LAS7h8PlBGspZclliurBMH8FbLtdLL2BXFHPlOIsHBLeg0gAXaL4NoaA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793382029; b=Ctn+xKohgR5aUgbWXke8Evs3vfHIqWPcWqGD1RIF3HwJLqXfPb4rOmMPCDTjE0DJs7uq0n OUktqiL4kj/moqnrs71/WG6tFFL5zNzU9fIeYGusN6InzCmSs5rlqmYa3HAXnCJ7zaxAte nTvPq9GwoXuqsCQctm4/4/FSB9OSddQOuR5QQERGMom65aNCU9pGZB2y+ZN5UXasks7Esn eBejb6rLs7//S7c73g4KO9Et5FHCWqOXDihrR64EFYxpSQrc/RZek4FVkqeF6C6295SPjO X1r46db6/czOTtLns8P2k7DhmrYQZVKLRh8YayRx2MsEo2z1M7gcFkEOLyc9cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382029; 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=c+4QPgPXoxgaNXqDeM88KBkTitCbkZ51Gn3kyvzT0HI=; b=w6ufi2V8IRLtvjbSHmFizGh+auFnfZP6cTiusW3pzHJ1MiR2Y7ilsYEth/ludIwr+XO2z8 h5C3Bm0RMKJidB9JGSS5hT5jw7H6ESmMH7kyD/FJj6KOIGZ+2T2w3KzE0MM83USmE+vx9d g4L54cmGCSfK338CG+FXY8WmVb+JHII0A5+bsEPl3ur6pTW76aCvkiE0vrApLN1W8pGEgY 0Piqps5XeRD64MgdPxzoNKUMJFoJLmlkzxPgJVml/0SydtKQy96lql7pIA0D4I95j2bLYD wnthXSTmbb7MwdesqMzd0rXXmNv3Ywl0c0XII4O8pkmrgvmovjMnffuG6fbl8w== 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 4jGSzw6gZZzdC0 for ; Fri, 30 Oct 2026 17:40:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4027e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 17:40:28 +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: b953e80ac305 - stable/15 - 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: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b953e80ac305349854aa2a2fe7cbf079da4ccbf0 Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 17:40:28 +0000 Message-Id: <6ae4d68c.4027e.34db7d1d@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b953e80ac305349854aa2a2fe7cbf079da4ccbf0 commit b953e80ac305349854aa2a2fe7cbf079da4ccbf0 Author: Olivier Cochard AuthorDate: 2026-10-16 04:32:29 +0000 Commit: Kevin Bowling CommitDate: 2026-10-30 17:40:04 +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 (cherry picked from commit c9599b80015a50e66c907dc667334a53bc234dab) --- 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. */