From nobody Tue Jan 9 01:00:17 2024 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 4T8CJy092vz55RNW; Tue, 9 Jan 2024 01:00:18 +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 4T8CJx6kNMz4JZj; Tue, 9 Jan 2024 01:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704762017; 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=XJUgVFEDL2oq32HvF1J/nA8ewY+JBWIOTbr+iWKlwDI=; b=reStRTaNJe5tMwc9qp/8qAyR5HfjyiNNSPdPmt0C01IcMQUgh2HfYtDykEarVX6qaZ1JO7 g7pT2taLtm7IlBZ9tz2I66O93/omv5QBXLK1fzKJN8CQmlpd0AESry6tpuiUDxU5YPh1MG jF04OlhLZsnd7HzsvMuJnZa//EjlMWqwZscmlOgylS5KUDF4RVFZTNypvt6qB7bAGYaYNR JXnQ65SHd5r9Nw2tW9JU9Hpaq65rwUOPCAhEQSYiEzStdR7sp0qGb2vpzmFSL/XT3qS3rY 8AiTVQji2MD7pyYH0RQVju+JFQsaZuY3hg7IDXojOX4nkvmEBEfiKLKRzbnV9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704762017; 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=XJUgVFEDL2oq32HvF1J/nA8ewY+JBWIOTbr+iWKlwDI=; b=wt6PQdxqdDNQnbliyZZq3g00oMjqb8/r1KrVsxzvzJCKAFDSlFdmUfe3mmpQZDGnjIHPRz 3dv2jlWQDuaJNm8R3OGpJB9fi1XhI4TmwWkRP60v20QgelK69s7F5TwWgko8ehpMV7V37P vIlGViFRgJbU5dX+1551llBqu6QjB5tIJMGJr+avMtR5lwJOFUw36Fa+3AUbaVNIhkt2jU o1ixdBH/HLZY6shJlGfhQdrF+ZHrUmiJ9QR1rPlemVnoEKLUDTIoJRrHim1+UjU/MA6YlR 8e6N9ZuWm4jqQUVI1Y2ZxmbPFrHpODv3q78CjmLUjuSE9xnGCZ4bDfu2YDSAUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704762017; a=rsa-sha256; cv=none; b=vIBMuY/e2veFa743Y9r0jxmRE6nVMcgfI22s1xNDjgSQbc3RMfvukmK9/txAuiyb7E92VC gp785piG9G83/tX5Pl5+cBuUlpaAjh7uGieWm39py1C6bWKJoN9p3umSkocL+Yo0F7hF2C l0Z3Iqb05C0agiVgXmSfYIiHOzj+Xt9xKae1rcdCCc7yAqh4sc/OV2CVqiUi7i84bzt/dd uF97wIh0y+NKNJ3ZRCm0e6lBmuvZhdcDlIkwOaKlZ2oy0PqTogW8QLGlns2IMat/rIelC8 OLBhvdZAxGdP/qq2jLLtVVbLiy9VcP9sTMahvrx05j5cO8/dVk6d9w2AZ464tQ== 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 4T8CJx5njtzVP7; Tue, 9 Jan 2024 01:00:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40910HOx071750; Tue, 9 Jan 2024 01:00:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40910HeR071742; Tue, 9 Jan 2024 01:00:17 GMT (envelope-from git) Date: Tue, 9 Jan 2024 01:00:17 GMT Message-Id: <202401090100.40910HeR071742@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 775958df04c4 - stable/14 - libdtrace: Fix TCP data offset handling in the tcpinfo_t translator List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 775958df04c4c94c69a37e25715efbd97138be0b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=775958df04c4c94c69a37e25715efbd97138be0b commit 775958df04c4c94c69a37e25715efbd97138be0b Author: Mark Johnston AuthorDate: 2024-01-01 21:33:30 +0000 Commit: Mark Johnston CommitDate: 2024-01-09 00:56:57 +0000 libdtrace: Fix TCP data offset handling in the tcpinfo_t translator The header gives an offset in 32-bit words, and the translator is supposed to convert that to a byte count. But, the conversion was incorrect. Reviewed by: tuexen, rscheff MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43264 (cherry picked from commit c3268c23de45b75b44102a02e96f44b0ff2f6ba7) --- cddl/lib/libdtrace/tcp.d | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cddl/lib/libdtrace/tcp.d b/cddl/lib/libdtrace/tcp.d index ea3a553ebf53..4e1061e6c7c1 100644 --- a/cddl/lib/libdtrace/tcp.d +++ b/cddl/lib/libdtrace/tcp.d @@ -263,7 +263,7 @@ translator tcpinfo_t < struct tcphdr *p > { tcp_dport = p == NULL ? 0 : ntohs(p->th_dport); tcp_seq = p == NULL ? -1 : ntohl(p->th_seq); tcp_ack = p == NULL ? -1 : ntohl(p->th_ack); - tcp_offset = p == NULL ? -1 : (p->th_off >> 2); + tcp_offset = p == NULL ? -1 : (p->th_off << 2); tcp_flags = p == NULL ? 0 : p->th_flags; tcp_window = p == NULL ? 0 : ntohs(p->th_win); tcp_checksum = p == NULL ? 0 : ntohs(p->th_sum); @@ -282,7 +282,7 @@ translator tcpinfoh_t < struct tcphdr *p > { tcp_dport = p == NULL ? 0 : ntohs(p->th_dport); tcp_seq = p == NULL ? -1 : p->th_seq; tcp_ack = p == NULL ? -1 : p->th_ack; - tcp_offset = p == NULL ? -1 : (p->th_off >> 2); + tcp_offset = p == NULL ? -1 : (p->th_off << 2); tcp_flags = p == NULL ? 0 : p->th_flags; tcp_window = p == NULL ? 0 : p->th_win; tcp_checksum = p == NULL ? 0 : ntohs(p->th_sum);