| From 65d2e83b0d7680e20907bf88f0d17b8d8edbe0d2 Mon Sep 17 00:00:00 2001 |
| From: Changbin Du <changbin.du@gmail.com> |
| Date: Sat, 16 Mar 2019 16:05:45 +0800 |
| Subject: perf config: Fix a memory leak in collect_config() |
| |
| [ Upstream commit 54569ba4b06d5baedae4614bde33a25a191473ba ] |
| |
| Detected with gcc's ASan: |
| |
| Direct leak of 66 byte(s) in 5 object(s) allocated from: |
| #0 0x7ff3b1f32070 in __interceptor_strdup (/usr/lib/x86_64-linux-gnu/libasan.so.5+0x3b070) |
| #1 0x560c8761034d in collect_config util/config.c:597 |
| #2 0x560c8760d9cb in get_value util/config.c:169 |
| #3 0x560c8760dfd7 in perf_parse_file util/config.c:285 |
| #4 0x560c8760e0d2 in perf_config_from_file util/config.c:476 |
| #5 0x560c876108fd in perf_config_set__init util/config.c:661 |
| #6 0x560c87610c72 in perf_config_set__new util/config.c:709 |
| #7 0x560c87610d2f in perf_config__init util/config.c:718 |
| #8 0x560c87610e5d in perf_config util/config.c:730 |
| #9 0x560c875ddea0 in main /home/changbin/work/linux/tools/perf/perf.c:442 |
| #10 0x7ff3afb8609a in __libc_start_main (/lib/x86_64-linux-gnu/libc.so.6+0x2409a) |
| |
| Signed-off-by: Changbin Du <changbin.du@gmail.com> |
| Reviewed-by: Jiri Olsa <jolsa@kernel.org> |
| Cc: Alexei Starovoitov <ast@kernel.org> |
| Cc: Daniel Borkmann <daniel@iogearbox.net> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Cc: Taeung Song <treeze.taeung@gmail.com> |
| Fixes: 20105ca1240c ("perf config: Introduce perf_config_set class") |
| Link: http://lkml.kernel.org/r/20190316080556.3075-6-changbin.du@gmail.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| tools/perf/util/config.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c |
| index 5ac157056cdf..9bb742accfa5 100644 |
| --- a/tools/perf/util/config.c |
| +++ b/tools/perf/util/config.c |
| @@ -628,11 +628,10 @@ static int collect_config(const char *var, const char *value, |
| } |
| |
| ret = set_value(item, value); |
| - return ret; |
| |
| out_free: |
| free(key); |
| - return -1; |
| + return ret; |
| } |
| |
| int perf_config_set__collect(struct perf_config_set *set, const char *file_name, |
| -- |
| 2.19.1 |
| |