git: c3268c23de45 - main - libdtrace: Fix TCP data offset handling in the tcpinfo_t translator

From: Mark Johnston <markj_at_FreeBSD.org>
Date: Mon, 01 Jan 2024 23:16:41 UTC
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=c3268c23de45b75b44102a02e96f44b0ff2f6ba7

commit c3268c23de45b75b44102a02e96f44b0ff2f6ba7
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-01-01 21:33:30 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-01-01 23:03:54 +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
---
 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 a91f2cd2b0b4..0df4e16d41d0 100644
--- a/cddl/lib/libdtrace/tcp.d
+++ b/cddl/lib/libdtrace/tcp.d
@@ -265,7 +265,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_x2 << 8) | p->th_flags);
 	tcp_window =	p == NULL ? 0  : ntohs(p->th_win);
 	tcp_checksum =	p == NULL ? 0  : ntohs(p->th_sum);
@@ -284,7 +284,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_x2 << 8) | p->th_flags);
 	tcp_window =	p == NULL ? 0  : p->th_win;
 	tcp_checksum =	p == NULL ? 0  : ntohs(p->th_sum);