From nobody Fri May 30 23:30:03 2025 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 4b8KGN5KDtz5x4yw; Fri, 30 May 2025 23:30:04 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8KGN2Jygz3stm; Fri, 30 May 2025 23:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748647804; 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=rcYZCUi/shQ/+2Z1cC4HFtg6zA96M/fvM8V06AUbf2M=; b=BT9Z96aCM9HzrHD21g7uquiodh1dpbNeeXdUVcKLUwu8hfNPyzIk6fZwGT6PjoaaRUjkjU VNsbxjB3yWks2oFy0MQNXFB5cNuyeSqD2sNkKpUSrixkKucshDCHf0x+y47cTHMvQKH80W 8kdcZN4SYSsRu/kwvjmgphLZg/NWehkIdU/UjEZPYpgiUcHSgUZei5bVji3S6iDrJnuGA+ w7dLsV+Ds84jXsCRHIdGuJHrQFTaUwXcy8C/xaVxULA4TT4geivJ0r4zJYdkiYGSpBeB4x j6Gb1pNQvroW9Ws8AkAqMhQcq9u+pJwUrKCUJ93n4cbER5oOkYd2+xy94RvNXw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748647804; a=rsa-sha256; cv=none; b=JFGFuOmrUSfgdwt8Wdtd+EV/IhMMBJlRHoYKElDm4svLzFxelyF2UopRPc7lp5aYgCJ6RK 5F88Br7+jPVFj8mBfx60Z1GNpjo3Oj0jbkeUkRnTPg14QlPI8ce4veXegWVke9cOxf+UTf DRfpzxhaE/TmCeeYmx4ttDZ6REirqxBuS3x09cDC2mIV5pAFG4d3c3qowsV+KwBGvZ5Ufk m12QoUUqQGCzdn7oGyVdSoDgzJqiINui3ebwa+/CxmdA6v5G1s2Q/CnBSuzOz8oS9XKKZk xwpgZ1swnFCM/MZHRt9pAqbvXGA9HVmlmu95d04Glv3BIP8kIoCCUpjvK3ZqoA== 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=1748647804; 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=rcYZCUi/shQ/+2Z1cC4HFtg6zA96M/fvM8V06AUbf2M=; b=dI23WsFFKZ9J5ehKUQT+MMZq/kdRcRH40jwO+6aF8pAHbT0+XbcnlBXGCkFeavxcCeFGGy WbSz7RhTbBkfyRYu9nxNg/nASmyKwVvEYoq7mzQ6U9PBt2GpOFiiZj5oxE5RN9QAfwgwO8 P8geAqumesKllkH1nrLBDJ6z1lnIHGIGLXVz3T0iprmrN310Ze56VVBCA68iePU8B5g4km hjIuSiKnFQnsTVn115lnSVu1Sny0LQiTCp5WNUbDb4l/FmweohQen3D5vBEploM8dnLhF5 H6R6UvMFQ/KckO4fLtpWckLeIVGl3B/8ykmzQDemfft7BRhg74uoCoe8OwcyFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b8KGN0Vcfz1C0k; Fri, 30 May 2025 23:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54UNU33T025883; Fri, 30 May 2025 23:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54UNU3Pv025880; Fri, 30 May 2025 23:30:03 GMT (envelope-from git) Date: Fri, 30 May 2025 23:30:03 GMT Message-Id: <202505302330.54UNU3Pv025880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 54f8c44ecf4a - main - cxgbe nic TLS: Correct IPv6 payload length List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 54f8c44ecf4a28a649d75ad6d0daaf3206ae9247 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=54f8c44ecf4a28a649d75ad6d0daaf3206ae9247 commit 54f8c44ecf4a28a649d75ad6d0daaf3206ae9247 Author: John Baldwin AuthorDate: 2025-05-30 23:17:45 +0000 Commit: John Baldwin CommitDate: 2025-05-30 23:29:42 +0000 cxgbe nic TLS: Correct IPv6 payload length Sponsored by: Chelsio Communications --- 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 897773d2d867..04bb6c944050 100644 --- a/sys/dev/cxgbe/crypto/t6_kern_tls.c +++ b/sys/dev/cxgbe/crypto/t6_kern_tls.c @@ -1167,7 +1167,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) | @@ -1267,7 +1268,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) | @@ -1911,7 +1913,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) |