Skip to content

Commit 0658553

Browse files
rostedtgregkh
authored andcommitted
tools lib traceevent: Do not free tep->cmdlines in add_new_comm() on failure
[ Upstream commit e0d2615856b2046c2e8d5bfd6933f37f69703b0b ] If the re-allocation of tep->cmdlines succeeds, then the previous allocation of tep->cmdlines will be freed. If we later fail in add_new_comm(), we must not free cmdlines, and also should assign tep->cmdlines to the new allocation. Otherwise when freeing tep, the tep->cmdlines will be pointing to garbage. Fixes: a6d2a61 ("tools lib traceevent: Remove some die() calls") Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: linux-trace-devel@vger.kernel.org Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20190828191819.970121417@goodmis.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent d3d9647 commit 0658553

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

tools/lib/traceevent/event-parse.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,10 @@ static int add_new_comm(struct pevent *pevent, const char *comm, int pid)
267267
errno = ENOMEM;
268268
return -1;
269269
}
270+
pevent->cmdlines = cmdlines;
270271

271272
cmdlines[pevent->cmdline_count].comm = strdup(comm);
272273
if (!cmdlines[pevent->cmdline_count].comm) {
273-
free(cmdlines);
274274
errno = ENOMEM;
275275
return -1;
276276
}
@@ -281,7 +281,6 @@ static int add_new_comm(struct pevent *pevent, const char *comm, int pid)
281281
pevent->cmdline_count++;
282282

283283
qsort(cmdlines, pevent->cmdline_count, sizeof(*cmdlines), cmdline_cmp);
284-
pevent->cmdlines = cmdlines;
285284

286285
return 0;
287286
}

0 commit comments

Comments
 (0)