From nobody Fri Oct 30 17:40:27 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 4jGSzw0JZdz6xGXV for ; Fri, 30 Oct 2026 17:40:28 +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 4jGSzv6Vqkz4gTX for ; Fri, 30 Oct 2026 17:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382027; 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=e+yZc2CWt5HrK2G5t2BdYpJnlOsmVe8CrETaD+3Nq5c=; b=cVlY0I/5+2oXFron0+7lUpaZdd989yVE653h2ni/dPiGVFrYohcvrSwo7yBAXi7LhQdkmW M/+wpNquxY9IbepdK9R1pd7qgPvrFaqliLqeU1p89uY1sxIpVbfNt15NU6aqKXAX7unlBU RBJbfLsLGuzGQn41l4WmZEauhT/QTSjDUZaqEN95VvbGOiDWEQKpLAMpqsArI4SSs0gBGE 6aYL71QbieBogPR/owdgYWJWohlo9/E7S799QJHdLF0cfVoe2f9PcFdGRVWmOf5wsXYTmK c4aJRsOw50dBtgqZJrNqxPqLCcljiJFyJBforodFtpNjD82r4L1b+BCY+gUXhQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793382027; b=VS/r3pJHDM9zOMHKCRFSV3xXqQR40wtslLObCRzxzShB8o15NqxFSzdIWvPRRs0Vmzizmc TnLI3Uw904TNB6cbzGWEYJhGVQxTuxohN9m+XUYYtAfyiLDMT+oj/1AXvt2wl99zvxPEGl klmA51HZWICWGw9s7zRBWeZ7NpEi7WD7XgsVRV6FSJ4/t3c7dWrK7RHZildXbniHqETzav UnsqVjskDtwotW6tgjSLqWUpN94gZUS3DDhFck4L+TUi8EMaJbjfW8va7gzhzPmQHc/Bjv mUfkyyF9QgPFbfJIvFn72nYmyM9v7IZG2dyFqLNNHYDOLsJtPA/9gzzFlBMAUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793382027; 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=e+yZc2CWt5HrK2G5t2BdYpJnlOsmVe8CrETaD+3Nq5c=; b=y2/TkkhCBsmUYWT4M6XYQGfJudA/hTEi9LUid66Ye/ZS3jGV99kE7v8RE75M2Ae9p7nyH+ 6+gwQZLM1h3fvYVpJqZW+MisUPWCmB6CtutLjgrO1RXoX5Op+B4PhAlbLI/O29gnLkc3zJ Ypx7D0sqWcANKfzOXGfO526gCvbnfAnm+RuS3lCjjxku5ZGUvxUEKlMUA/lnXy0xZo0HcP RS3oFxiDyA//lmTbVKYStjkGmo/NWE9Vmc21dzQd0wiH9DaZyc3WGc8FQWpA22CpSPvJZN ZwVkSDSIV1Dz65BxEjVyN0fLEF7aHh//E9xfkxZHEPoLIJoltCittaXXE5Onbw== 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 4jGSzv68gzzdX6 for ; Fri, 30 Oct 2026 17:40:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 41a8f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 17:40:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Andrew Gallatin From: Kevin Bowling Subject: git: 7b8ddbd4a07d - stable/15 - sendfile: Fix bug when using headers with SW KTLS offload 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: 7b8ddbd4a07de27c12319aad36750f4946ff12be Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 17:40:27 +0000 Message-Id: <6ae4d68b.41a8f.27f19b81@gitrepo.freebsd.org> The branch stable/15 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=7b8ddbd4a07de27c12319aad36750f4946ff12be commit 7b8ddbd4a07de27c12319aad36750f4946ff12be Author: Andrew Gallatin AuthorDate: 2026-05-22 17:57:54 +0000 Commit: Kevin Bowling CommitDate: 2026-10-30 17:39:48 +0000 sendfile: Fix bug when using headers with SW KTLS offload When using SW KTLS, we must account for the headers in sf_iodone() in terms of either freeing or enqueuing them for TLS work. Not doing so can lead to a situation where we enqueue only the payload, and not the header, for encryption. Rather than leaking the header, the socket is left "hung" with the header marked M_NOTREADY. Sponsored by: Netflix Reviewed by: glebius, kib Differential Revision: https://reviews.freebsd.org/D57134 (cherry picked from commit fd9af1e7084c550358d9598407f9ee7583e6a53f) --- sys/kern/kern_sendfile.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_sendfile.c b/sys/kern/kern_sendfile.c index a64024cdafe3..c14f784f26cd 100644 --- a/sys/kern/kern_sendfile.c +++ b/sys/kern/kern_sendfile.c @@ -96,6 +96,8 @@ struct sf_io { vm_pindex_t pindex0; #ifdef KERN_TLS struct ktls_session *tls; + struct mbuf *tls_m; + int tls_enq_cnt; #endif vm_page_t pa[]; }; @@ -386,7 +388,12 @@ sendfile_iodone(void *arg, vm_page_t *pa, int count, int error) so->so_proto->pr_abort(so); so->so_error = EIO; - mb_free_notready(sfio->m, sfio->npages); +#ifdef KERN_TLS + if (sfio->tls_m != NULL) + mb_free_notready(sfio->tls_m, sfio->tls_enq_cnt); + else +#endif + mb_free_notready(sfio->m, sfio->npages); #ifdef KERN_TLS } else if (sfio->tls != NULL && sfio->tls->mode == TCP_TLS_MODE_SW) { /* @@ -398,7 +405,10 @@ sendfile_iodone(void *arg, vm_page_t *pa, int count, int error) * Donate the socket reference from sfio to rather * than explicitly invoking soref(). */ - ktls_enqueue(sfio->m, so, sfio->npages); + if (sfio->tls_m != NULL) + ktls_enqueue(sfio->tls_m, so, sfio->tls_enq_cnt); + else + ktls_enqueue(sfio->m, so, sfio->npages); goto out_with_ref; #endif } else @@ -958,6 +968,8 @@ vn_sendfile(struct file *fp, int sockfd, struct uio *hdr_uio, * for all of sfio's lifetime. */ sfio->tls = tls; + sfio->tls_m = NULL; + sfio->tls_enq_cnt = 0; #endif vm_object_pip_add(obj, 1); error = sendfile_swapin(obj, sfio, &nios, off, space, rhpages, @@ -1201,6 +1213,13 @@ prepend_header: } else { sfio->so = so; sfio->m = m0; +#ifdef KERN_TLS + if (hdrlen != 0 && tls != NULL && + tls->mode == TCP_TLS_MODE_SW) { + sfio->tls_m = m; + sfio->tls_enq_cnt = tls_enq_cnt; + } +#endif soref(so); error = pr->pr_send(so, PRUS_NOTREADY, m, NULL, NULL, td);