From: Stephane Eranian <eranian@google.com>
To: linux-kernel@vger.kernel.org
Cc: acme@redhat.com, peterz@infradead.org, mingo@elte.hu, jolsa@redhat.com
Subject: [PATCH v2] perf ordered_events: fix crash in free_dup_event()
Date: Wed, 8 Aug 2018 15:33:20 -0700 [thread overview]
Message-ID: <1533767600-7794-1-git-send-email-eranian@google.com> (raw)
This patch fixes a bug in ordered_event.c:alloc_event().
An ordered_event struct was not initialized properly potentially
causing crashes later on in free_dup_event() depending on the
content of the memory. If it was NULL, then it would work fine,
otherwise, it could cause crashes such as:
$ perf record -o - -e cycles date | perf inject -b -i - >/dev/null
Tue Aug 7 12:03:48 PDT 2018
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.000 MB - ]
Segmentation fault (core dumped):
(gdb) r inject -b -i - < tt >/dev/null
Program received signal SIGSEGV, Segmentation fault.
free_dup_event (oe=0x26a39a0, event=0xffffffff00000000) at util/ordered-events.c:85
(gdb) bt
#0 free_dup_event (oe=0x26a39a0, event=0xffffffff00000000) at util/ordered-events.c:85
#1 ordered_events__free (oe=0x26a39a0) at util/ordered-events.c:310
#2 0x00000000004b5a56 in __perf_session__process_pipe_events (session=<optimized out>) at util/session.c:1753
#3 perf_session__process_events (session=<optimized out>) at util/session.c:1932
#4 0x000000000043a2eb in __cmd_inject (inject=<optimized out>) at builtin-inject.c:750
#5 cmd_inject (argc=<optimized out>, argv=<optimized out>) at builtin-inject.c:924
#6 0x000000000046b175 in run_builtin (p=0xabc640 <commands+576>, argc=4, argv=0x7fffffffe560) at perf.c:297
#7 0x000000000046b062 in handle_internal_command (argc=4, argv=0x7fffffffe560) at perf.c:349
#8 0x000000000046a5e8 in run_argv (argcp=<optimized out>, argv=<optimized out>) at perf.c:393
#9 main (argc=4, argv=0x7fffffffe560) at perf.c:531
Signed-off-by: Stephane Eranian <eranian@google.com>
---
tools/perf/util/ordered-events.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-events.c
index a90dbe5df019..95c91e5a3754 100644
--- a/tools/perf/util/ordered-events.c
+++ b/tools/perf/util/ordered-events.c
@@ -118,6 +118,12 @@ static struct ordered_event *alloc_event(struct ordered_events *oe,
pr("alloc size %" PRIu64 "B (+%zu), max %" PRIu64 "B\n",
oe->cur_alloc_size, size, oe->max_alloc_size);
+ /*
+ * must initialize event pointer of commandeered first
+ * entry to avoid crash in free_dup_event() due to random
+ * value for this field.
+ */
+ oe->buffer->event = NULL;
oe->cur_alloc_size += size;
list_add(&oe->buffer->list, &oe->to_free);
--
2.18.0.597.ga71716f1ad-goog
next reply other threads:[~2018-08-08 22:33 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-08 22:33 Stephane Eranian [this message]
2018-08-09 8:07 ` [PATCH v2] perf ordered_events: fix crash in free_dup_event() Jiri Olsa
2018-08-10 8:21 ` Stephane Eranian
2018-08-10 11:54 ` Jiri Olsa
2018-08-13 13:04 ` [PATCH] perf tools: Add struct ordered_events_buffer layer Jiri Olsa
2018-08-14 7:14 ` Stephane Eranian
2018-08-15 8:48 ` Jiri Olsa
2018-08-27 9:28 ` [PATCHv2] " Jiri Olsa
2018-08-27 11:07 ` Namhyung Kim
2018-08-27 15:24 ` Stephane Eranian
2018-08-27 17:05 ` [PATCHv3] " Jiri Olsa
2018-09-02 14:47 ` Jiri Olsa
2018-09-04 2:37 ` Stephane Eranian
2018-09-06 13:28 ` Jiri Olsa
2018-09-06 15:04 ` Stephane Eranian
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=1533767600-7794-1-git-send-email-eranian@google.com \
--to=eranian@google.com \
--cc=acme@redhat.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
/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).