From nobody Sun Jun 25 19:26:10 2023 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 4Qq1DM4NHmz4hK24; Sun, 25 Jun 2023 19:26:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qq1DM1Hrwz4QNN; Sun, 25 Jun 2023 19:26:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687721171; 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=O87euG63Rn7IIxiZjl3+g9DAnpc97V09JvmkTBSoQU0=; b=rHXRsN64lLaV2amQIpS4qcS2JMgFzsucooD4MwCDDcPuUWFueJwh0VCMkjYzfYWw42DZkX 8/Rfsu3w9BOk8o0fH1vB9HgEYtvFqNnKkbPYdt3EKjuXFp3NBO38fEFmctfc6PhMAiFQxq ne+lFzirwmZVCPbP8CKISKNuIDZZr7VNeLVjyoydJDx+JGqOW6YkLdFnuT+lACgU9ArCbR Ov57ORC1898aPPLIbvgPEVCu6DmSxbvHRoOzHfUp+ZbCc2Oj1vfbL5lho5TTWYVgzekXxb MS18xXVQFhnLNgIogkT/GOkf+14m67IPnmJZZ68t35Kbd7U/X2qNA9gzZUpsGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687721171; 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=O87euG63Rn7IIxiZjl3+g9DAnpc97V09JvmkTBSoQU0=; b=FTJDzZ35fYO3/q5uQaT61vaGn+744bsL49K6KY2QJ5HGYFIZVg90daN3SGdl/mRXWjU9y2 u/xy7L+3BcWXp6JdthWbo/xEJpoGtsq5DaZagm/TPenGIF56qC+apdP5S6GRhxuBuLo3t7 WVugKTYvEvpponTHtMsT6eyDAJLRftaTAqHHwScIqtaCn7GywwTvmOkfyXt2mIeJxznDYC HuuEWIBtLml/txClLz4NUUSz/xkTFaxo6aHpr6QK5aApAW7wb7Z6sx1Qx7uROQElpd+iHf zDfha+Hqzj6RoIA4px0us6s3RnacRtyleUaUBxLjTWuia2FsltJHb5q6ZtJcrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687721171; a=rsa-sha256; cv=none; b=HPCS5cZJP3FPof0p2ZBveuTbPlwTH2uBxamR7MEHl8jsx06AknuPQ16qPX5b5wm3+Jvyrq GNBQ5YA8F4i1c51YKX9MTU+RTjTIZDjTt0LOjBD1shBbhy8Iei5VknmIpLwdtal95MKDte OQcJ7SPlZl3tGXLr1Ik6P0LFPcaqkMV37LSsg7JKBnPJ5YkuOV/hv5r+vCuvJgDHS3Zdbn VoOPHPa8X/hCAxgh3VhrzgWvIXyiBHjIODL1frfwRR8tqLNC9DxB5m4trbxWP99wt3ozl5 Y/939xI/+VN3/ZGQCfvQx+oNjLYY7JmSCKq10rFnyvKvESGJEOPng0M0aGmpKg== 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 4Qq1DL6BFbzfSR; Sun, 25 Jun 2023 19:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35PJQANc024796; Sun, 25 Jun 2023 19:26:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35PJQAoi024795; Sun, 25 Jun 2023 19:26:10 GMT (envelope-from git) Date: Sun, 25 Jun 2023 19:26:10 GMT Message-Id: <202306251926.35PJQAoi024795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 081ecd9cf028 - stable/13 - tcp: fix TCP MD5 digest computation for TCP over UDP 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 081ecd9cf0285a2f094be42792c7bea45bbc72ed Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=081ecd9cf0285a2f094be42792c7bea45bbc72ed commit 081ecd9cf0285a2f094be42792c7bea45bbc72ed Author: Michael Tuexen AuthorDate: 2023-06-21 20:48:12 +0000 Commit: Michael Tuexen CommitDate: 2023-06-25 19:25:37 +0000 tcp: fix TCP MD5 digest computation for TCP over UDP Skip the UDP header for the computation. This is similar to skipping IPv6 extension headers. Reviewed by: cc, rscheff Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D40596 (cherry picked from commit 0fb0711dba76a32a2202d2f41d64aa1247b5e51d) --- sys/netipsec/xform_tcp.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/sys/netipsec/xform_tcp.c b/sys/netipsec/xform_tcp.c index ce2552f0a205..e9513d5476d0 100644 --- a/sys/netipsec/xform_tcp.c +++ b/sys/netipsec/xform_tcp.c @@ -55,6 +55,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include @@ -136,15 +137,20 @@ ip_pseudo_compute(struct mbuf *m, MD5_CTX *ctx) { struct ippseudo ipp; struct ip *ip; + int hdr_len; ip = mtod(m, struct ip *); ipp.ippseudo_src.s_addr = ip->ip_src.s_addr; ipp.ippseudo_dst.s_addr = ip->ip_dst.s_addr; ipp.ippseudo_p = IPPROTO_TCP; ipp.ippseudo_pad = 0; - ipp.ippseudo_len = htons(m->m_pkthdr.len - (ip->ip_hl << 2)); + hdr_len = ip->ip_hl << 2; + if (ip->ip_p == IPPROTO_UDP) + /* TCP over UDP */ + hdr_len += sizeof(struct udphdr); + ipp.ippseudo_len = htons(m->m_pkthdr.len - hdr_len); MD5Update(ctx, (char *)&ipp, sizeof(ipp)); - return (ip->ip_hl << 2); + return (hdr_len); } #endif @@ -158,14 +164,20 @@ ip6_pseudo_compute(struct mbuf *m, MD5_CTX *ctx) uint32_t nxt; } ip6p __aligned(4); struct ip6_hdr *ip6; + int hdr_len; ip6 = mtod(m, struct ip6_hdr *); ip6p.src = ip6->ip6_src; ip6p.dst = ip6->ip6_dst; - ip6p.len = htonl(m->m_pkthdr.len - sizeof(*ip6)); /* XXX: ext headers */ + hdr_len = sizeof(struct ip6_hdr); + if (ip6->ip6_nxt == IPPROTO_UDP) + /* TCP over UDP */ + hdr_len += sizeof(struct udphdr); + /* XXX: ext headers */ + ip6p.len = htonl(m->m_pkthdr.len - hdr_len); ip6p.nxt = htonl(IPPROTO_TCP); MD5Update(ctx, (char *)&ip6p, sizeof(ip6p)); - return (sizeof(*ip6)); + return (hdr_len); } #endif