From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Peter Zijlstra <peterz@infradead.org>,
LKML <linux-kernel@vger.kernel.org>,
Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
linux-perf-users@vger.kernel.org,
Stephane Eranian <eranian@google.com>
Subject: [PATCH 1/4] perf record: Fix a segfault in record__read_lost_samples()
Date: Fri, 23 Sep 2022 10:31:39 -0700 [thread overview]
Message-ID: <20220923173142.805896-2-namhyung@kernel.org> (raw)
In-Reply-To: <20220923173142.805896-1-namhyung@kernel.org>
When it fails to open events record__open() returns without setting the
session->evlist. Then it gets a segfault in the function trying to read
lost sample counts. You can easily reproduce it as a normal user like:
$ perf record -p 1 true
...
perf: Segmentation fault
...
Skip the function if it has no evlist. And add more protection for evsels
which are not properly initialized.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/builtin-record.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 741e763436ca..f4f1619199e5 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1888,6 +1888,10 @@ static void record__read_lost_samples(struct record *rec)
struct perf_record_lost_samples *lost;
struct evsel *evsel;
+ /* there was an error during record__open */
+ if (session->evlist == NULL)
+ return;
+
lost = zalloc(PERF_SAMPLE_MAX_SIZE);
if (lost == NULL) {
pr_debug("Memory allocation failed\n");
@@ -1899,6 +1903,8 @@ static void record__read_lost_samples(struct record *rec)
evlist__for_each_entry(session->evlist, evsel) {
struct xyarray *xy = evsel->core.sample_id;
+ if (xy == NULL || evsel->core.fd == NULL)
+ continue;
if (xyarray__max_x(evsel->core.fd) != xyarray__max_x(xy) ||
xyarray__max_y(evsel->core.fd) != xyarray__max_y(xy)) {
pr_debug("Unmatched FD vs. sample ID: skip reading LOST count\n");
--
2.37.3.998.g577e59143f-goog
next prev parent reply other threads:[~2022-09-23 17:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-23 17:31 [PATCH 0/4] perf tools: Assorted random fixes and updates Namhyung Kim
2022-09-23 17:31 ` Namhyung Kim [this message]
2022-09-23 23:20 ` [PATCH 1/4] perf record: Fix a segfault in record__read_lost_samples() Ian Rogers
2022-09-25 1:08 ` Leo Yan
2022-09-23 17:31 ` [PATCH 2/4] perf inject: Clarify build-id options a little bit Namhyung Kim
2022-09-23 17:31 ` [PATCH 3/4] perf tools: Add 'addr' sort key Namhyung Kim
2022-09-23 23:21 ` Ian Rogers
2022-09-23 17:31 ` [PATCH 4/4] perf annotate: Toggle full address <-> offset display Namhyung Kim
2022-09-23 23:22 ` Ian Rogers
2022-09-26 13:09 ` [PATCH 0/4] perf tools: Assorted random fixes and updates Arnaldo Carvalho de Melo
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=20220923173142.805896-2-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=eranian@google.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mingo@kernel.org \
--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
all inboxes | Powered by JetHome®