perf tools: Use list_del_init() more thorougly

To allow for destructors to check if they're operating on a object still
in a list, and to avoid going from use after free list entries into
still valid, or even also other already removed from list entries.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-deh17ub44atyox3j90e6rksu@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c
index c0be44e65e9d..574e30ec6d7c 100644
--- a/tools/perf/builtin-lock.c
+++ b/tools/perf/builtin-lock.c
@@ -454,7 +454,7 @@ broken:
                 /* broken lock sequence, discard it */
                 ls->discard = 1;
                 bad_hist[BROKEN_ACQUIRE]++;
-                list_del(&seq->list);
+                list_del_init(&seq->list);
                 free(seq);
                 goto end;
         default:
@@ -515,7 +515,7 @@ static int report_lock_acquired_event(struct perf_evsel *evsel,
                 /* broken lock sequence, discard it */
                 ls->discard = 1;
                 bad_hist[BROKEN_ACQUIRED]++;
-                list_del(&seq->list);
+                list_del_init(&seq->list);
                 free(seq);
                 goto end;
         default:
@@ -570,7 +570,7 @@ static int report_lock_contended_event(struct perf_evsel *evsel,
                 /* broken lock sequence, discard it */
                 ls->discard = 1;
                 bad_hist[BROKEN_CONTENDED]++;
-                list_del(&seq->list);
+                list_del_init(&seq->list);
                 free(seq);
                 goto end;
         default:
@@ -639,7 +639,7 @@ static int report_lock_release_event(struct perf_evsel *evsel,
 
         ls->nr_release++;
 free_seq:
-        list_del(&seq->list);
+        list_del_init(&seq->list);
         free(seq);
 end:
         return 0;