Skip to contentSkip to conversation

perf data convert json: Fix addr_location leak on time-filtered samples

PATCH Applied Tanushree Shah 3 participants 3 messages Jun 6 – Jun 10 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf data convert json: Fix addr_location leak on time-filtered samples

When samples are skipped due to time filtering in process_sample_event(), the early return path bypasses addr_location__exit(), causing memory leaks of thread, map, and maps references acquired by machine__resolve().

These references must be released through addr_location__exit() before returning.

Fixes 8e746e95c3e4 ("perf data: Allow filtering conversion by time range")
---
 tools/perf/util/data-convert-json.c | 1 +
 1 file changed, 1 insertion(+)
tools/perf/util/data-convert-json.c +1 -0
index d526c91312ed..6a8d00c80394 100644
@@ -177,6 +177,7 @@ static int process_sample_event(const struct perf_tool *tool,
 
 	if (perf_time__ranges_skip_sample(c->ptime_range, c->range_num, sample->time)) {
 		++c->skipped;
+		addr_location__exit(&al);
 		return 0;
 	}
 
Signature · 1 line
2.47.3
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 10 lines · Tanushree Shah

When samples are skipped due to time filtering in process_sample_event(), the early return path bypasses addr_location__exit(), causing memory leaks of thread, map, and maps references acquired by machine__resolve().

These references must be released through addr_location__exit() before returning.

Fixes 8e746e95c3e4 ("perf data: Allow filtering conversion by time range")

Thanks,
Ian

Quoted 19 lines
---
 tools/perf/util/data-convert-json.c | 1 +
 1 file changed, 1 insertion(+)
tools/perf/util/data-convert-json.c +1 -1
index d526c91312ed..6a8d00c80394 100644
@@ -177,6 +177,7 @@ static int process_sample_event(const struct perf_tool *tool,
 
        if (perf_time__ranges_skip_sample(c->ptime_range, c->range_num, sample->time)) {
                ++c->skipped;
+               addr_location__exit(&al);
                return 0;
        }
 
--

2.47.3

maintainer Applied
#2 lore raw
Quoted 6 lines · Ian Rogers
Quoted 5 lines · Tanushree Shah

When samples are skipped due to time filtering in process_sample_event(), the early return path bypasses addr_location__exit(), causing memory leaks of thread, map, and maps references acquired by machine__resolve().

Quoted 7 lines
Quoted 5 lines

These references must be released through addr_location__exit() before returning.

Fixes 8e746e95c3e4 ("perf data: Allow filtering conversion by time range")

Thanks, applied to perf-tools-next, for v7.2.

- Arnaldo