summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorVince Weaver <vincent.weaver@maine.edu>2019-07-23 11:06:01 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2019-07-29 09:03:43 -0300
commit7622236ceb167aa3857395f9bdaf871442aa467e (patch)
tree993385e9e5ebb0725940784a5e4f34a07e0a0b9c /tools
parente54599c93dbf487ef80ba2833c5760c22bd20c32 (diff)
downloadlinux-7622236ceb167aa3857395f9bdaf871442aa467e.tar.gz
linux-7622236ceb167aa3857395f9bdaf871442aa467e.tar.bz2
linux-7622236ceb167aa3857395f9bdaf871442aa467e.zip
perf header: Fix divide by zero error if f_header.attr_size==0
So I have been having lots of trouble with hand-crafted perf.data files causing segfaults and the like, so I have started fuzzing the perf tool. First issue found: If f_header.attr_size is 0 in the perf.data file, then perf will crash with a divide-by-zero error. Committer note: Added a pr_err() to tell the user why the command failed. Signed-off-by: Vince Weaver <vincent.weaver@maine.edu> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/alpine.DEB.2.21.1907231100440.14532@macbook-air Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/util/header.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 20111f8da5cb..47877f0f6667 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -3559,6 +3559,13 @@ int perf_session__read_header(struct perf_session *session)
data->file.path);
}
+ if (f_header.attr_size == 0) {
+ pr_err("ERROR: The %s file's attr size field is 0 which is unexpected.\n"
+ "Was the 'perf record' command properly terminated?\n",
+ data->file.path);
+ return -EINVAL;
+ }
+
nr_attrs = f_header.attrs.size / f_header.attr_size;
lseek(fd, f_header.attrs.offset, SEEK_SET);