FAILED: patch "[PATCH] tools lib traceevent: Do not free tep->cmdlines in" failed to apply to 4.4-stable tree
[email protected]
maintainerThe patch below does not apply to the 4.4-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 <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From b0215e2d6a18d8331b2d4a8b38ccf3eff783edb1 Mon Sep 17 00:00:00 2001
From: "Steven Rostedt (VMware)" <[email protected]>
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.
tools/lib/traceevent/event-parse.c +1 -2
@@ -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 ; }