Skip to content

Commit e5dee82

Browse files
acmelgregkh
authored andcommitted
perf trace: Use zfree() to reduce chances of use after free
[ Upstream commit 9997d5d ] Do defensive programming by using zfree() to initialize freed pointers to NULL, so that eventual use after free result in a NULL pointer deref instead of more subtle behaviour. Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> Stable-dep-of: 7962ef1 ("perf trace: Really free the evsel->priv area") Signed-off-by: Sasha Levin <[email protected]>
1 parent eb17c3d commit e5dee82

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/perf/builtin-trace.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2293,7 +2293,7 @@ static void syscall__exit(struct syscall *sc)
22932293
if (!sc)
22942294
return;
22952295

2296-
free(sc->arg_fmt);
2296+
zfree(&sc->arg_fmt);
22972297
}
22982298

22992299
static int trace__sys_enter(struct trace *trace, struct evsel *evsel,
@@ -3129,7 +3129,7 @@ static void evlist__free_syscall_tp_fields(struct evlist *evlist)
31293129
if (!et || !evsel->tp_format || strcmp(evsel->tp_format->system, "syscalls"))
31303130
continue;
31313131

3132-
free(et->fmt);
3132+
zfree(&et->fmt);
31333133
free(et);
31343134
}
31353135
}
@@ -4765,11 +4765,11 @@ static void trace__exit(struct trace *trace)
47654765
int i;
47664766

47674767
strlist__delete(trace->ev_qualifier);
4768-
free(trace->ev_qualifier_ids.entries);
4768+
zfree(&trace->ev_qualifier_ids.entries);
47694769
if (trace->syscalls.table) {
47704770
for (i = 0; i <= trace->sctbl->syscalls.max_id; i++)
47714771
syscall__exit(&trace->syscalls.table[i]);
4772-
free(trace->syscalls.table);
4772+
zfree(&trace->syscalls.table);
47734773
}
47744774
syscalltbl__delete(trace->sctbl);
47754775
zfree(&trace->perfconfig_events);

0 commit comments

Comments
 (0)