diff options
author | Xie XiuQi <xiexiuqi@huawei.com> | 2020-05-21 21:32:17 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-10-01 13:14:46 +0200 |
commit | dd155a48a0c9b53404b30f6f92ccf9f8160378c1 (patch) | |
tree | 38c78939f81c81e6f30a6c06053e053a96c5809b | |
parent | d911653688c588c22bdbc83459f87961c9d4399e (diff) | |
download | linux-stable-dd155a48a0c9b53404b30f6f92ccf9f8160378c1.tar.gz linux-stable-dd155a48a0c9b53404b30f6f92ccf9f8160378c1.tar.bz2 linux-stable-dd155a48a0c9b53404b30f6f92ccf9f8160378c1.zip |
perf util: Fix memory leak of prefix_if_not_in
[ Upstream commit 07e9a6f538cbeecaf5c55b6f2991416f873cdcbd ]
Need to free "str" before return when asprintf() failed to avoid memory
leak.
Signed-off-by: Xie XiuQi <xiexiuqi@huawei.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Hongbo Yao <yaohongbo@huawei.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Li Bin <huawei.libin@huawei.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lore.kernel.org/lkml/20200521133218.30150-4-liwei391@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r-- | tools/perf/util/sort.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 46daa22b86e3..85ff4f68adc0 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -2690,7 +2690,7 @@ static char *prefix_if_not_in(const char *pre, char *str) return str; if (asprintf(&n, "%s,%s", pre, str) < 0) - return NULL; + n = NULL; free(str); return n; |