diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2019-07-15 16:04:26 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-16 10:11:05 +0200 |
| commit | b55b050d9bff898cb6da42383e1e2ae3569ee756 (patch) | |
| tree | 79eee0e8f4f3261fd169d44a8a0b827c3f1a6c9d /tools/perf/util | |
| parent | 62abdd2ba83c39dae6e716b015c125316dde323a (diff) | |
| download | linux-stable-b55b050d9bff898cb6da42383e1e2ae3569ee756.tar.gz linux-stable-b55b050d9bff898cb6da42383e1e2ae3569ee756.tar.bz2 linux-stable-b55b050d9bff898cb6da42383e1e2ae3569ee756.zip | |
perf tools: Fix proper buffer size for feature processing
[ Upstream commit 79b2fe5e756163897175a8f57d66b26cd9befd59 ]
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@redhat.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: David Carrillo-Cisneros <davidcc@google.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.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@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools/perf/util')
| -rw-r--r-- | tools/perf/util/header.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index b82d4577d969..e84b70be3fc1 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -3666,7 +3666,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)) |