perf jit: Fix a few memory leaks
Ian Rogers
reviewerPATCH v2 1/1 perf jit: Fix a few memory leaks
As reported by leak sanitizer.
Signed-off-by Ian Rogers <[email protected]>
--- tools/perf/util/genelf_debug.c | 45 +++++++++++++++++++++------------- tools/perf/util/jitdump.c | 7 +++++- 2 files changed, 34 insertions(+), 18 deletions(-)
tools/perf/util/genelf_debug.c +28 -17
@@ -87,6 +87,12 @@ buffer_ext_init(struct buffer_ext *be) be->max_sz =0 ; } +static void +buffer_ext_exit (struct buffer_ext *be) +{ +free (be->data); +} +static inline size_t buffer_ext_size (struct buffer_ext *be) {
@@ -487,28 +493,28 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entriesElf_Scn *scn;Elf_Shdr *shdr;struct buffer_ext dl, di, da; -int ret; +int ret =-1 ;buffer_ext_init (&dl);buffer_ext_init (&di);buffer_ext_init (&da); - ret =jit_process_debug_info (code_addr, debug, nr_debug_entries, &dl, &da, &di); -if (ret) -return -1 ; +if (jit_process_debug_info (code_addr, debug, nr_debug_entries, &dl, &da, &di)) + goto out; +/* * setup .debug_line section */ scn =elf_newscn (e);if (!scn) {warnx ("cannot create section" ); -return -1 ; + goto out; } d =elf_newdata (scn);if (!d) {warnx ("cannot get new data" ); -return -1 ; + goto out; } d->d_align =1 ;
@@ -521,7 +527,7 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries shdr =elf_getshdr (scn);if (!shdr) {warnx ("cannot get section header" ); -return -1 ; + goto out; } shdr->sh_name =52 ;/* .debug_line */
@@ -536,13 +542,13 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries scn =elf_newscn (e);if (!scn) {warnx ("cannot create section" ); -return -1 ; + goto out; } d =elf_newdata (scn);if (!d) {warnx ("cannot get new data" ); -return -1 ; + goto out; } d->d_align =1 ;
@@ -555,7 +561,7 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries shdr =elf_getshdr (scn);if (!shdr) {warnx ("cannot get section header" ); -return -1 ; + goto out; } shdr->sh_name =64 ;/* .debug_info */
@@ -570,13 +576,13 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries scn =elf_newscn (e);if (!scn) {warnx ("cannot create section" ); -return -1 ; + goto out; } d =elf_newdata (scn);if (!d) {warnx ("cannot get new data" ); -return -1 ; + goto out; } d->d_align =1 ;
@@ -589,7 +595,7 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries shdr =elf_getshdr (scn);if (!shdr) {warnx ("cannot get section header" ); -return -1 ; + goto out; } shdr->sh_name =76 ;/* .debug_info */
@@ -601,9 +607,14 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries/* * now we update the ELF image with all the sections */ -if (elf_update (e,ELF_C_WRITE ) <0 ) { +if (elf_update (e,ELF_C_WRITE ) <0 )warnx ("elf_update debug failed" ); -return -1 ; - } -return 0 ; +else + ret =0 ; + +out: +buffer_ext_exit (&dl); +buffer_ext_exit (&di); +buffer_ext_exit (&da); +return ret; }
tools/perf/util/jitdump.c +6 -1
@@ -235,9 +235,11 @@ jit_open(struct jit_buf_desc *jd, const char *name)*/ strcpy (jd->dir, name);dirname (jd->dir); +free (buf);return 0 ; error: +free (buf);funlockfile (jd->in);fclose (jd->in);return retval;
@@ -523,7 +525,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr) ret =perf_event__process_mmap2 (tool, event, &sample, jd->machine);if (ret) -return ret; + goto out; ret =jit_inject_event (jd, event);/*
@@ -532,6 +534,8 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr)if (!ret)build_id__mark_dso_hit (tool, event, &sample,NULL , jd->machine); +out: +free (event);return ret; }
@@ -874,6 +878,7 @@ jit_process(struct perf_session *session, }nsinfo__put (jd.nsi); +free (jd.buf);return ret; }
Signature · 1 line
2.40.0.348.gf938b09366-goog
Em Mon, Apr 03, 2023 at 01:35:45PM -0700, Ian Rogers escreveu:
Quoted 1 line
As reported by leak sanitizer.
Thanks, applied.
- Arnaldo
Quoted 181 lines
Signed-off-by Ian Rogers <[email protected]>--- tools/perf/util/genelf_debug.c | 45 +++++++++++++++++++++------------- tools/perf/util/jitdump.c | 7 +++++- 2 files changed, 34 insertions(+), 18 deletions(-)tools/perf/util/genelf_debug.c +28
-17@@ -87,6 +87,12 @@ buffer_ext_init(struct buffer_ext *be) be->max_sz =0 ; } +static void +buffer_ext_exit (struct buffer_ext *be) +{ +free (be->data); +} +static inline size_t buffer_ext_size (struct buffer_ext *be) {@@ -487,28 +493,28 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entriesElf_Scn *scn;Elf_Shdr *shdr;struct buffer_ext dl, di, da; -int ret; +int ret =-1 ;buffer_ext_init (&dl);buffer_ext_init (&di);buffer_ext_init (&da); - ret =jit_process_debug_info (code_addr, debug, nr_debug_entries, &dl, &da, &di); -if (ret) -return -1 ; +if (jit_process_debug_info (code_addr, debug, nr_debug_entries, &dl, &da, &di)) + goto out; +/* * setup .debug_line section */ scn =elf_newscn (e);if (!scn) {warnx ("cannot create section" ); -return -1 ; + goto out; } d =elf_newdata (scn);if (!d) {warnx ("cannot get new data" ); -return -1 ; + goto out; } d->d_align =1 ;@@ -521,7 +527,7 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries shdr =elf_getshdr (scn);if (!shdr) {warnx ("cannot get section header" ); -return -1 ; + goto out; } shdr->sh_name =52 ;/* .debug_line */ @@ -536,13 +542,13 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries scn =elf_newscn (e);if (!scn) {warnx ("cannot create section" ); -return -1 ; + goto out; } d =elf_newdata (scn);if (!d) {warnx ("cannot get new data" ); -return -1 ; + goto out; } d->d_align =1 ;@@ -555,7 +561,7 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries shdr =elf_getshdr (scn);if (!shdr) {warnx ("cannot get section header" ); -return -1 ; + goto out; } shdr->sh_name =64 ;/* .debug_info */ @@ -570,13 +576,13 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries scn =elf_newscn (e);if (!scn) {warnx ("cannot create section" ); -return -1 ; + goto out; } d =elf_newdata (scn);if (!d) {warnx ("cannot get new data" ); -return -1 ; + goto out; } d->d_align =1 ;@@ -589,7 +595,7 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries shdr =elf_getshdr (scn);if (!shdr) {warnx ("cannot get section header" ); -return -1 ; + goto out; } shdr->sh_name =76 ;/* .debug_info */ @@ -601,9 +607,14 @@ jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_entries/* * now we update the ELF image with all the sections */ -if (elf_update (e,ELF_C_WRITE ) <0 ) { +if (elf_update (e,ELF_C_WRITE ) <0 )warnx ("elf_update debug failed" ); -return -1 ; - } -return 0 ; +else + ret =0 ; + +out: +buffer_ext_exit (&dl); +buffer_ext_exit (&di); +buffer_ext_exit (&da); +return ret; }tools/perf/util/jitdump.c +6
-1@@ -235,9 +235,11 @@ jit_open(struct jit_buf_desc *jd, const char *name)*/ strcpy (jd->dir, name);dirname (jd->dir); +free (buf);return 0 ; error: +free (buf);funlockfile (jd->in);fclose (jd->in);return retval;@@ -523,7 +525,7 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr) ret =perf_event__process_mmap2 (tool, event, &sample, jd->machine);if (ret) -return ret; + goto out; ret =jit_inject_event (jd, event);/* @@ -532,6 +534,8 @@ static int jit_repipe_code_load(struct jit_buf_desc *jd, union jr_entry *jr)if (!ret)build_id__mark_dso_hit (tool, event, &sample,NULL , jd->machine); +out: +free (event);return ret; }@@ -874,6 +878,7 @@ jit_process(struct perf_session *session, }nsinfo__put (jd.nsi); +free (jd.buf);return ret; }Signature · 1 line
2.40.0.348.gf938b09366-goog
Signature · 1 line
- Arnaldo