[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <alpine.LFD.2.20.1512032331580.20385@riemann>
Date: Thu, 3 Dec 2015 23:34:13 +0100 (CET)
From: John Kacur <jkacur@...hat.com>
To: Steven Rostedt <rostedt@...dmis.org>
cc: LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] trace-cmd: trace-cmd.c call free only once on tracing and
path
>From 33102b6423ba64798d91aee9de4ecb21189dd49e Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@...hat.com>
Date: Thu, 3 Dec 2015 23:29:05 +0100
Subject: [PATCH] trace-cmd: don't call free on tracing and path more than once
In version trace-cmd-stable-v2.2 it is possible to call free on
tracing and path more than once.
Ensure this only happens once by moving this block to after the call
to out_free
Signed-off-by: John Kacur <jkacur@...hat.com>
---
trace-recorder.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/trace-recorder.c b/trace-recorder.c
index 540765bc9c65..cfdc45e053ab 100644
--- a/trace-recorder.c
+++ b/trace-recorder.c
@@ -97,15 +97,15 @@ struct tracecmd_recorder *tracecmd_create_recorder_fd(int fd, int cpu, unsigned
if (recorder->trace_fd < 0)
goto out_free;
- free(tracing);
- free(path);
-
if ((recorder->flags & TRACECMD_RECORD_NOSPLICE) == 0) {
ret = pipe(recorder->brass);
if (ret < 0)
goto out_free;
}
+ free(tracing);
+ free(path);
+
return recorder;
out_free:
--
2.4.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists