From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: Clark Williams <williams@redhat.com>,
linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Sanskriti Sharma <sansharm@redhat.com>,
Joe Lawrence <joe.lawrence@redhat.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 07/12] perf tools: Avoid double free in read_event_file()
Date: Mon, 8 Oct 2018 21:54:22 -0300 [thread overview]
Message-ID: <20181009005427.6607-8-acme@kernel.org> (raw)
In-Reply-To: <20181009005427.6607-1-acme@kernel.org>
From: Sanskriti Sharma <sansharm@redhat.com>
The temporary 'buf' buffer allocated in read_event_file() may be freed
twice. Move the free() call to the common function exit point.
Fixes the following coverity complaints:
Error: USE_AFTER_FREE (CWE-825):
tools/perf/util/trace-event-read.c:309: double_free: Calling "free"
frees pointer "buf" which has already been freed.
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-5-git-send-email-sansharm@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/util/trace-event-read.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index b98ee2a2eb44..a278e1eee5f5 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -297,10 +297,8 @@ static int read_event_file(struct tep_handle *pevent, char *sys,
}
ret = do_read(buf, size);
- if (ret < 0) {
- free(buf);
+ if (ret < 0)
goto out;
- }
ret = parse_event_file(pevent, buf, size, sys);
if (ret < 0)
--
2.14.4
next prev parent reply other threads:[~2018-10-09 0:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-09 0:54 [GIT PULL 00/12] perf/core improvements and fixes Arnaldo Carvalho de Melo
2018-10-09 0:54 ` [PATCH 01/12] tools include: Adopt linux/bits.h Arnaldo Carvalho de Melo
2018-10-09 8:47 ` Alexander Sverdlin
2018-10-09 14:01 ` Arnaldo Carvalho de Melo
2018-10-09 0:54 ` [PATCH 02/12] perf auxtrace: Include missing asm/bitsperlong.h to get BITS_PER_LONG Arnaldo Carvalho de Melo
2018-10-09 8:43 ` Alexander Sverdlin
2018-10-09 0:54 ` [PATCH 03/12] perf test: S390 does not support watchpoints in test 22 Arnaldo Carvalho de Melo
2018-10-09 0:54 ` [PATCH 04/12] perf strbuf: Match va_{add,copy} with va_end Arnaldo Carvalho de Melo
2018-10-09 0:54 ` [PATCH 05/12] perf tools: Cleanup trace-event-info 'tdata' leak Arnaldo Carvalho de Melo
2018-10-09 0:54 ` [PATCH 06/12] perf tools: Free 'printk' string in parse_ftrace_printk() Arnaldo Carvalho de Melo
2018-10-09 0:54 ` Arnaldo Carvalho de Melo [this message]
2018-10-09 0:54 ` [PATCH 08/12] perf tools: Free temporary 'sys' string in read_event_files() Arnaldo Carvalho de Melo
2018-10-09 0:54 ` [PATCH 09/12] perf python: Make clang_has_option() work on Python 3 Arnaldo Carvalho de Melo
2018-10-09 0:54 ` [PATCH 10/12] perf python: More portable way to make CFLAGS work with clang Arnaldo Carvalho de Melo
2018-10-09 0:54 ` [PATCH 11/12] tools lib traceevent: Separate out tep_strerror() for strerror_r() issues Arnaldo Carvalho de Melo
2018-10-09 0:54 ` [PATCH 12/12] tools lib traceevent, perf tools: Move struct tep_handler definition in a local header file Arnaldo Carvalho de Melo
2018-10-09 5:24 ` [GIT PULL 00/12] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181009005427.6607-8-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=joe.lawrence@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sansharm@redhat.com \
--cc=williams@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).