From nobody Thu Jan 29 15:39:54 2026 X-Original-To: dev-commits-src-branches@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 4f23HG5cyMz6QrbL for ; Thu, 29 Jan 2026 15:39:54 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f23HG3rKTz3xjd for ; Thu, 29 Jan 2026 15:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769701194; 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=yneJ+FOlXLkDSSQ20F4t5qA2CQSuQBa7MqelDfC61wk=; b=Oj4Tv4ZFNdTaPsniv610YK0ULEBgAWRRF62zgXx5/IkUocsVGHYuMe/XoEL0nAHB+TU2NI tGFOU1siU+yCRWa16K0rqpahNg47GniITjtktjrFw6BSl8teE/0QQYCGoozi9Sz2aSNQW/ r44d0lYdvRDujlEzme8cwBAvKjJTXQIwqhep//+5PQlSaPeYAvdxvAgcNCeK6bPhypCWki 8u9r0/st+oQUAppRDpsZGein1B8xMkus68mtayu5hsBO2TOxY4C5GTFNyjmr2ZkX1rzosP jOWZqG+88V5ANvfyj4NYYsuPb/z52xXevIoaMryr2xvBaODsJ8AGvC6NUJRt/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769701194; a=rsa-sha256; cv=none; b=V6GCKeGzPkjiVYGBjqRiZ3+C+PVZu7dICdHCI1/iZcyQgrrAZLB/tqDvULWMVAgwgVSD9l OzIrVK+yx/qifVHkaxeiM2NIDJjSGoXL2vAr24VCA6AJfZrdhA7m7fgl/bUR9nCDfheY9a /iTct95UyR/1C3pwM7VkXXxSp7QAf8cyy3jIJIPU2X1uUhLONRXnwniTYKhXuDpF2uYHWz 1aGlixUPPsuqw+qjV1kbun0HnteXXwavC2XLbvrr+uCmFOOYiCXANmj85nNkBcHMNfu6AN yMrkZRZKiIbenMGaY01EcRdZiJEDxy6xHMXkKuGiRuf/eAyj4T44LSdJgmTQtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769701194; 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=yneJ+FOlXLkDSSQ20F4t5qA2CQSuQBa7MqelDfC61wk=; b=RTFKZDeOcigJy6dAQEGpXcyu0bgD2BJ9SZ4JOzjlq0jwbUSHoHdNMiffCSQv2y4n6LEsZL Lga2WDKc5l+oz3rS1eB9vsax2aZq9SeWR2BaqgTIWhJxp5tgPO0CwrF61pqMTjEDWhgPdQ 22t4SJQbAkzdLYSmb8YSDWNC9RlZ4m26ESyis3wrcMkp92fI/mU9GB/s7PF0UTLzzN7IV4 fymtbTCl0C+gq9n5/EoHaj6dDE2FvTwk4+9PvM1ZW7VXrAe1Ywdo3Ylg/xJduogw2m20Zh rW3T6BwspmBijaIKN/H99HfFDiRyTyiVuAnxA7avAbSAhVAYoIbGeEPXlh1Rqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f23HG3NkKzkqL for ; Thu, 29 Jan 2026 15:39:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38b6e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Jan 2026 15:39:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 5fce28c2f81d - stable/14 - cxgbe nic TLS: Correct IPv6 payload length List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 5fce28c2f81d070c6321c9c5dc8d03831f32b242 Auto-Submitted: auto-generated Date: Thu, 29 Jan 2026 15:39:54 +0000 Message-Id: <697b7f4a.38b6e.6d5d0d1@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5fce28c2f81d070c6321c9c5dc8d03831f32b242 commit 5fce28c2f81d070c6321c9c5dc8d03831f32b242 Author: John Baldwin AuthorDate: 2025-05-30 23:17:45 +0000 Commit: John Baldwin CommitDate: 2026-01-29 15:18:17 +0000 cxgbe nic TLS: Correct IPv6 payload length Sponsored by: Chelsio Communications (cherry picked from commit 54f8c44ecf4a28a649d75ad6d0daaf3206ae9247) --- sys/dev/cxgbe/crypto/t6_kern_tls.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/dev/cxgbe/crypto/t6_kern_tls.c b/sys/dev/cxgbe/crypto/t6_kern_tls.c index 0e7bd305869b..d0da7ec2f61d 100644 --- a/sys/dev/cxgbe/crypto/t6_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t6_kern_tls.c @@ -1168,7 +1168,8 @@ ktls_write_tcp_options(struct sge_txq *txq, void *dst, struct mbuf *m, } else { ip6 = (void *)((char *)eh + m->m_pkthdr.l2hlen); newip6 = *ip6; - newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen); + newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen - + sizeof(*ip6)); copy_to_txd(&txq->eq, (caddr_t)&newip6, &out, sizeof(newip6)); MPASS(m->m_pkthdr.l3hlen == sizeof(*ip6)); ctrl1 = V_TXPKT_CSUM_TYPE(TX_CSUM_TCPIP6) | @@ -1268,7 +1269,8 @@ ktls_write_tunnel_packet(struct sge_txq *txq, void *dst, struct mbuf *m, } else { ip6 = (void *)((char *)eh + m->m_pkthdr.l2hlen); newip6 = *ip6; - newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen); + newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen - + sizeof(*ip6)); copy_to_txd(&txq->eq, (caddr_t)&newip6, &out, sizeof(newip6)); MPASS(m->m_pkthdr.l3hlen == sizeof(*ip6)); ctrl1 = V_TXPKT_CSUM_TYPE(TX_CSUM_TCPIP6) | @@ -1912,7 +1914,8 @@ ktls_write_tcp_fin(struct sge_txq *txq, void *dst, struct mbuf *m, } else { ip6 = (void *)((char *)eh + m->m_pkthdr.l2hlen); newip6 = *ip6; - newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen); + newip6.ip6_plen = htons(pktlen - m->m_pkthdr.l2hlen - + sizeof(*ip6)); copy_to_txd(&txq->eq, (caddr_t)&newip6, &out, sizeof(newip6)); MPASS(m->m_pkthdr.l3hlen == sizeof(*ip6)); ctrl1 = V_TXPKT_CSUM_TYPE(TX_CSUM_TCPIP6) |