| From 945e113f829f673b2e2da48663abf66a2ab1f7c9 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 28 Aug 2019 15:05:28 -0400 |
| Subject: tools lib traceevent: Do not free tep->cmdlines in add_new_comm() on |
| failure |
| |
| From: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| |
| [ 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: a6d2a61ac653a ("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> |
| --- |
| tools/lib/traceevent/event-parse.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c |
| index def61125ac36d..62f4cacf253ab 100644 |
| --- a/tools/lib/traceevent/event-parse.c |
| +++ b/tools/lib/traceevent/event-parse.c |
| @@ -267,10 +267,10 @@ static int add_new_comm(struct pevent *pevent, const char *comm, int pid) |
| errno = ENOMEM; |
| return -1; |
| } |
| + pevent->cmdlines = cmdlines; |
| |
| cmdlines[pevent->cmdline_count].comm = strdup(comm); |
| if (!cmdlines[pevent->cmdline_count].comm) { |
| - free(cmdlines); |
| errno = ENOMEM; |
| return -1; |
| } |
| @@ -281,7 +281,6 @@ static int add_new_comm(struct pevent *pevent, const char *comm, int pid) |
| pevent->cmdline_count++; |
| |
| qsort(cmdlines, pevent->cmdline_count, sizeof(*cmdlines), cmdline_cmp); |
| - pevent->cmdlines = cmdlines; |
| |
| return 0; |
| } |
| -- |
| 2.20.1 |
| |