Messages in this thread | | | Date | Tue, 30 Nov 2021 16:22:36 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH] perf header: Fix memory leaks |
| |
Em Tue, Nov 30, 2021 at 07:15:19PM +0100, Jiri Olsa escreveu: > On Mon, Nov 29, 2021 at 03:38:28PM -0800, Ian Rogers wrote: > > On Sun, Nov 28, 2021 at 7:47 AM Jiri Olsa <jolsa@redhat.com> wrote: > > > > > > On Thu, Nov 18, 2021 at 12:17:30PM -0800, Ian Rogers wrote: > > > > These leaks were found with leak sanitizer running "perf pipe recording > > > > and injection test". In pipe mode feat_fd may hold onto an events struct > > > > that needs freeing. When string features are processed they may > > > > overwrite an already created string, so free this before the overwrite. > > > > > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > > > --- > > > > tools/perf/util/header.c | 15 ++++++++++----- > > > > 1 file changed, 10 insertions(+), 5 deletions(-) > > > > > > > > diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c > > > > index 79cce216727e..e3c1a532d059 100644 > > > > --- a/tools/perf/util/header.c > > > > +++ b/tools/perf/util/header.c > > > > @@ -2321,6 +2321,7 @@ static int perf_header__read_build_ids(struct perf_header *header, > > > > #define FEAT_PROCESS_STR_FUN(__feat, __feat_env) \ > > > > static int process_##__feat(struct feat_fd *ff, void *data __maybe_unused) \ > > > > {\ > > > > + free(ff->ph->env.__feat_env); \ > > > > > > hm, how is this set before this callback is triggered? > > > > I see it for cpuid which is initially set in: > > #0 perf_env__read_cpuid (env=0x62b000007240) at util/env.c:363 > > #1 0x0000555556325153 in perf_env__cpuid (env=0x62b000007240) at util/env.c:456 > > #2 0x00005555564002ff in evlist__init_trace_event_sample_raw > > ok, I forgot we do this one, thanks for explanation > > Acked-by: Jiri Olsa <jolsa@redhat.com>
Thanks, applied.
- Arnaldo
| |