[v3,23/23] trace-cmd: Read at least 8 bytes trace-id option

Message ID	20210324130418.436206-24-tz.stoyanov@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-trace-devel-owner@kernel.org> From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> To: rostedt@goodmis.org Cc: linux-trace-devel@vger.kernel.org Subject: [PATCH v3 23/23] trace-cmd: Read at least 8 bytes trace-id option Date: Wed, 24 Mar 2021 15:04:18 +0200 Message-Id: <20210324130418.436206-24-tz.stoyanov@gmail.com> In-Reply-To: <20210324130418.436206-1-tz.stoyanov@gmail.com> References: <20210324130418.436206-1-tz.stoyanov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	TSC trace clock to nanosecond conversion \| expand [v3,00/23] TSC trace clock to nanosecond conversion [v3,01/23] trace-cmd: Add initial perf interface in trace-cmd library [v3,02/23] trace-cmd: Extend trace-cmd dump subcommand to display the clock [v3,03/23] trace-cmd: Save only the selected clock in the trace.dat file [v3,04/23] trace-cmd: Internal refactoring, move logic for local tep handler in its own function [v3,05/23] trace-cmd: Add new local function to check if a trace clock is supported [v3,06/23] trace-cmd: Add new trace-cmd clock tsc2nsec [v3,07/23] trace-cmd: Define a new option for tsc2nsec conversion [v3,08/23] trace-cmd: Save information for tsc to nanoseconds conversion in trace file [v3,09/23] trace-cmd: Read information for tsc to nanoseconds conversion from trace file [v3,10/23] trace-cmd: Save tsc2nsec clock in trace.dat file [v3,11/23] trace-cmd: Append new options into guest trace file at the end of the tracing session [v3,12/23] trace-cmd: Remove unneeded multiply in events timestamp reading [v3,13/23] trace-cmd: Perform all timestamp corrections in a single function [v3,14/23] trace-cmd: Convert tsc timestamps to nanosecods when reading trace data from a file [v3,15/23] trace-cmd: Set order and priorities when applying timestamp corrections [v3,16/23] trace-cmd: Add a new flag to disable any timestamp corrections [v3,17/23] trace-cmd: Change "--nodate" option to affect "--date" option only [v3,18/23] trace-cmd: Add new parameter "--raw-ts" to "trace-cmd report" command [v3,19/23] trace-cmd: Print times in TimeShift options as unsigned in trace-cmd dump [v3,20/23] trace-cmd: Use tsc clock for host-guest tracing, if available [v3,21/23] trace-cmd: Get current clock for host-guest tracing session [v3,22/23] trace-cmd: Save the trace clocks in TRACECLOCK option [v3,23/23] trace-cmd: Read at least 8 bytes trace-id option

Message ID

20210324130418.436206-24-tz.stoyanov@gmail.com (mailing list archive)

State

Superseded

Headers

From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v3 23/23] trace-cmd: Read at least 8 bytes trace-id option
Date: Wed, 24 Mar 2021 15:04:18 +0200
Message-Id: <20210324130418.436206-24-tz.stoyanov@gmail.com>
In-Reply-To: <20210324130418.436206-1-tz.stoyanov@gmail.com>
References: <20210324130418.436206-1-tz.stoyanov@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

TSC trace clock to nanosecond conversion | expand

Commit Message

Tzvetomir Stoyanov (VMware) March 24, 2021, 1:04 p.m. UTC

When reading the trace-id option from trace.dat file, check if the size
is at least 8 bytes. If the size is greater, use the first 8 bytes only
and ignore the rest. That way we can safely extend this option in the
future, without breaking the legacy logic.

Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
 lib/trace-cmd/trace-input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 0f5ed684..5ec12ed9 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -2703,7 +2703,7 @@  static int handle_options(struct tracecmd_input *handle)
 				trace_pid_map_load(handle, buf);
 			break;
 		case TRACECMD_OPTION_TRACEID:
-			if (size != 8)
+			if (size < 8)
 				break;
 			handle->trace_id = tep_read_number(handle->pevent,
 							   buf, 8);

[v3,23/23] trace-cmd: Read at least 8 bytes trace-id option

Commit Message

Patch