summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSanskriti Sharma2018-10-02 16:29:14 +0200
committerGreg Kroah-Hartman2018-11-13 20:08:22 +0100
commit8e4b824648dbe402d9dbbf05959c618c745ff590 (patch)
treeb607aaa483c6d3ffc34f370a0cd51cf4f450fd5e /tools
parentspi: spi-ep93xx: Use dma_data_direction for ep93xx_spi_dma_{finish,prepare} (diff)
downloadkernel-qcow2-linux-8e4b824648dbe402d9dbbf05959c618c745ff590.tar.gz
kernel-qcow2-linux-8e4b824648dbe402d9dbbf05959c618c745ff590.tar.xz
kernel-qcow2-linux-8e4b824648dbe402d9dbbf05959c618c745ff590.zip
perf tools: Free temporary 'sys' string in read_event_files()
[ Upstream commit 1e44224fb0528b4c0cc176bde2bb31e9127eb14b ] For each system in a given pevent, read_event_files() reads in a temporary 'sys' string. Be sure to free this string before moving onto to the next system and/or leaving read_event_files(). Fixes the following coverity complaints: Error: RESOURCE_LEAK (CWE-772): tools/perf/util/trace-event-read.c:343: overwrite_var: Overwriting "sys" in "sys = read_string()" leaks the storage that "sys" points to. tools/perf/util/trace-event-read.c:353: leaked_storage: Variable "sys" going out of scope leaks the storage it points to. Signed-off-by: Sanskriti Sharma <sansharm@redhat.com> Reviewed-by: Jiri Olsa <jolsa@kernel.org> Cc: Joe Lawrence <joe.lawrence@redhat.com> Link: http://lkml.kernel.org/r/1538490554-8161-6-git-send-email-sansharm@redhat.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/trace-event-read.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index 3dfc1db6b25b..5eb1b2469bba 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -349,9 +349,12 @@ static int read_event_files(struct tep_handle *pevent)
for (x=0; x < count; x++) {
size = read8(pevent);
ret = read_event_file(pevent, sys, size);
- if (ret)
+ if (ret) {
+ free(sys);
return ret;
+ }
}
+ free(sys);
}
return 0;
}