[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-79b2fe5e756163897175a8f57d66b26cd9befd59@git.kernel.org>
Date: Tue, 23 Jul 2019 14:48:33 -0700
From: tip-bot for Jiri Olsa <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: alexander.shishkin@...ux.intel.com, davidcc@...gle.com,
kan.liang@...ux.intel.com, acme@...hat.com, peterz@...radead.org,
linux-kernel@...r.kernel.org, tglx@...utronix.de, hpa@...or.com,
jolsa@...nel.org, mingo@...nel.org, namhyung@...nel.org,
songliubraving@...com
Subject: [tip:perf/urgent] perf tools: Fix proper buffer size for feature
processing
Commit-ID: 79b2fe5e756163897175a8f57d66b26cd9befd59
Gitweb: https://git.kernel.org/tip/79b2fe5e756163897175a8f57d66b26cd9befd59
Author: Jiri Olsa <jolsa@...nel.org>
AuthorDate: Mon, 15 Jul 2019 16:04:26 +0200
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Tue, 23 Jul 2019 08:59:49 -0300
perf tools: Fix proper buffer size for feature processing
After Song Liu's segfault fix for pipe mode, Arnaldo reported following
error:
# perf record -o - | perf script
0x514 [0x1ac]: failed to process type: 80
It's caused by wrong buffer size setup in feature processing, which
makes cpu topology feature fail, because it's using buffer size to
recognize its header version.
Reported-by: Arnaldo Carvalho de Melo <acme@...hat.com>
Signed-off-by: Jiri Olsa <jolsa@...nel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Alexander Shishkin <alexander.shishkin@...ux.intel.com>
Cc: David Carrillo-Cisneros <davidcc@...gle.com>
Cc: Kan Liang <kan.liang@...ux.intel.com>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Song Liu <songliubraving@...com>
Fixes: e9def1b2e74e ("perf tools: Add feature header record to pipe-mode")
Link: http://lkml.kernel.org/r/20190715140426.32509-1-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/header.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index c24db7f4909c..20111f8da5cb 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -3747,7 +3747,7 @@ int perf_event__process_feature(struct perf_session *session,
return 0;
ff.buf = (void *)fe->data;
- ff.size = event->header.size - sizeof(event->header);
+ ff.size = event->header.size - sizeof(*fe);
ff.ph = &session->header;
if (feat_ops[feat].process(&ff, NULL))
Powered by blists - more mailing lists