From nobody Tue Jan 9 01:01:09 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 4T8CKy1fyBz55RbD; Tue, 9 Jan 2024 01:01:10 +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 4T8CKx6hksz4KrK; Tue, 9 Jan 2024 01:01:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704762069; 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=7XnGkB1osFqOmT4SbGs9OgrO9ue2AzlsNAgVEmBMHXQ=; b=ItkWZciY3uSVym3TYGnyLX3jBXodQTrNcM8ivjXae34UKSYgqJ9nO+JVXdXb6nogvLteCb YY0b7FvQ8ZbAgT+GKQb2yALftIgE7vDi3teX4N4xAOdXS/wHOZfiyLQ8cAkcX+i1y09nJL y92apfRq1QTerRSLTDr7x6M9cKzOXrIZbuUAxUBD/w56Oc4uZmHGGtvc8JXXeUZ+/oReKB +bz4hrc7XW1rPY28lvElVsrYKdez6Kh4oAIAcqn1C62BZFcApgtKtuUQ139QofSQT/QcEH 2VPyt0MSAhIwgdKY1vYy/JYdegk/5MWs0srbqDdRnzXI+tla6vH7JXyWrovR7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704762069; 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=7XnGkB1osFqOmT4SbGs9OgrO9ue2AzlsNAgVEmBMHXQ=; b=cDpUg5fpSnFkPybROBidcnbl4n7VPFast7rIWaEexUOP7TIuYyrrAZP1rjlfUquUP3t6Zp beQZ5vi9zKuWtiaoHv1jhLXynf7Cy9VQFDKXnJRJ6a5PGAHhtr6mxG5CQ+F5ryrWagXyTe EO1FgRVQp517ZU92xeLBTBoxcKh8DDHud26xKZX55G29ukoSfsdDb6qKGPElge8XQwi+u8 0G69n4IDwru2WLRfpbujhqdEvyPEos2d98XKTM7RqIi30Qf4RsyTfiUYPggSBX6To3P1hn nEABxN1gYXjEX40sAGwQkLyr4ju/R+uxKpm0P+wSlNQv7NuhaqV/TW95/0I8LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704762069; a=rsa-sha256; cv=none; b=GpPQKhk/xdm1A0o2QGMdNYJak/IDrI+POjLejTighv74Z7OoGjsk8V78mXYlLI+CcPaPQO ThODHbgKY20IVrD6RRRAza1438oQqUj+0vzel3KcYuEAMglOqYc9e5Fd5sKwiO3VFJIH35 H2Ec+nDpwqLMd5wvqJC+g0BP19UFBMr3eYw9+DzH0xN2h/4PhMEyukOuUSqyZcADNlyiax H7CzmkaqGk/pP7aXiae13cMe48V9rgMEXpjBC9JY3xtiHYIF29Fmb4kMaowquqih/+pB9F cafWe5hfrYZ5c2YPHhYiN5fsP7Pb6SkgYt9MS7AnBn2O8bu61jhADAFde4SWAw== 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 4T8CKx5n7KzVkh; Tue, 9 Jan 2024 01:01:09 +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 409119A7075095; Tue, 9 Jan 2024 01:01:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 409119Yf075092; Tue, 9 Jan 2024 01:01:09 GMT (envelope-from git) Date: Tue, 9 Jan 2024 01:01:09 GMT Message-Id: <202401090101.409119Yf075092@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: cc8af47b6d4c - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: cc8af47b6d4ce9c40ed03ace7c130409fe0962a0 Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cc8af47b6d4ce9c40ed03ace7c130409fe0962a0 commit cc8af47b6d4ce9c40ed03ace7c130409fe0962a0 Author: Mark Johnston AuthorDate: 2024-01-01 21:33:30 +0000 Commit: Mark Johnston CommitDate: 2024-01-09 01:00:30 +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 2ccbd574055d..32a1afce9ae2 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);