[v2] trace-cmd: Fix "trace-cmd extract" temp files path

Commit Message

Vincent Donnefort Oct. 1, 2020, 8:59 a.m. UTC

From: Vincent Donnefort <[e-mail]>

During the introduction of instance's output_file copy:

  3a206ca ("trace-cmd: Have instances include a copy of its output file")

The extract path has been omitted, causing the temp files created to be
written in the same directory using the null "output_file" of the
instance, to create "(null).cpuX" files. If this is executed in a
directory that is not writable (like /sys/kernel/tracing) or does not
have enough space to hold the temp files, then it will fail to write.

Signed-off-by: Vincent Donnefort <[e-mail]>

Comments

Steven Rostedt Oct. 1, 2020, 4:30 p.m. UTC | #1

On Thu,  1 Oct 2020 09:59:29 +0100
[e-mail] wrote:

> From: Vincent Donnefort <[e-mail]>
> 
> During the introduction of instance's output_file copy:
> 
>   3a206ca ("trace-cmd: Have instances include a copy of its output file")
> 
> The extract path has been omitted, causing the temp files created to be
> written in the same directory using the null "output_file" of the
> instance, to create "(null).cpuX" files. If this is executed in a
> directory that is not writable (like /sys/kernel/tracing) or does not
> have enough space to hold the temp files, then it will fail to write.
> 
> Signed-off-by: Vincent Donnefort <[e-mail]>
> 
> diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
> index bd00457..72a5c8c 100644
> --- a/tracecmd/trace-record.c
> +++ b/tracecmd/trace-record.c
> @@ -6622,6 +6622,9 @@ void trace_extract(int argc, char **argv)
>  
>  	/* Save the state of tracing_on before starting */
>  	for_all_instances(instance) {
> +		instance->output_file = strdup(ctx.output);
> +		if (!instance->output_file)
> +			die("Failed to allocate output file name for instance");
>  
>  		if (!ctx.manual && instance->flags & BUFFER_FL_PROFILE)
>  			enable_profile(ctx.instance);

Applied. Thanks Vincent!

-- Steve

Patch

diff --git a/tracecmd/trace-record.c b/tracecmd/trace-record.c
index bd00457..72a5c8c 100644
--- a/tracecmd/trace-record.c
+++ b/tracecmd/trace-record.c
@@ -6622,6 +6622,9 @@  void trace_extract(int argc, char **argv)
 
 	/* Save the state of tracing_on before starting */
 	for_all_instances(instance) {
+		instance->output_file = strdup(ctx.output);
+		if (!instance->output_file)
+			die("Failed to allocate output file name for instance");
 
 		if (!ctx.manual && instance->flags & BUFFER_FL_PROFILE)
 			enable_profile(ctx.instance);