FAILED: patch "[PATCH] tools lib traceevent: Do not free tep->cmdlines in" failed to apply to 4.19-stable tree

FAILED: patch "[PATCH] tools lib traceevent: Do not free tep->cmdlines in" failed to apply to 4.19-stable tree

[gregkh]

The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From b0215e2d6a18d8331b2d4a8b38ccf3eff783edb1 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
Date: Wed, 28 Aug 2019 15:05:28 -0400
Subject: [PATCH] tools lib traceevent: Do not free tep->cmdlines in
 add_new_comm() on failure

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>

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index b36b536a9fcb..13fd9fdf91e0 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -269,10 +269,10 @@ static int add_new_comm(struct tep_handle *tep,
 		errno = ENOMEM;
 		return -1;
 	}
+	tep->cmdlines = cmdlines;
 
 	cmdlines[tep->cmdline_count].comm = strdup(comm);
 	if (!cmdlines[tep->cmdline_count].comm) {
-		free(cmdlines);
 		errno = ENOMEM;
 		return -1;
 	}
@@ -283,7 +283,6 @@ static int add_new_comm(struct tep_handle *tep,
 		tep->cmdline_count++;
 
 	qsort(cmdlines, tep->cmdline_count, sizeof(*cmdlines), cmdline_cmp);
-	tep->cmdlines = cmdlines;
 
 	return 0;
 }

Re: FAILED: patch "[PATCH] tools lib traceevent: Do not free tep->cmdlines in" failed to apply to 4.19-stable tree

[Sasha Levin]

On Tue, Oct 08, 2019 at 09:34:18AM +0200, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.19-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From b0215e2d6a18d8331b2d4a8b38ccf3eff783edb1 Mon Sep 17 00:00:00 2001
>From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
>Date: Wed, 28 Aug 2019 15:05:28 -0400
>Subject: [PATCH] tools lib traceevent: Do not free tep->cmdlines in
> add_new_comm() on failure
>
>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>

Conflicts due to pevent -> tep renames in traceevent. I've fixed it up
and queued on all kernels.

--
Thanks,
Sasha