leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools lib traceevent: Do not free tep->cmdlines in add_new_comm() on failure

Browse Source 
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: a6d2a61ac6 ("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>
This commit is contained in:
Steven Rostedt (VMware)
2019-08-28 15:05:28 -04:00
committed by Arnaldo Carvalho de Melo
parent b397f8468f
commit b0215e2d6a
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/lib/traceevent/event-parse.c
View File

@@ -269,10 +269,10 @@ static int add_new_comm(struct tep_handle *tep,
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
} }
tep->cmdlines = cmdlines;
cmdlines[tep->cmdline_count].comm = strdup(comm); cmdlines[tep->cmdline_count].comm = strdup(comm);
if (!cmdlines[tep->cmdline_count].comm) { if (!cmdlines[tep->cmdline_count].comm) {
free(cmdlines);
errno = ENOMEM; errno = ENOMEM;
return -1; return -1;
} }
@@ -283,7 +283,6 @@ static int add_new_comm(struct tep_handle *tep,
tep->cmdline_count++; tep->cmdline_count++;
qsort(cmdlines, tep->cmdline_count, sizeof(*cmdlines), cmdline_cmp); qsort(cmdlines, tep->cmdline_count, sizeof(*cmdlines), cmdline_cmp);
tep->cmdlines = cmdlines;
return 0; return 0;
} }