1 files changed, 9 insertions, 2 deletions

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index c24db7f4909c..1903d7ec9797 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);
 
@@ -3639,7 +3646,7 @@ int perf_event__synthesize_attr(struct perf_tool *tool,
         size += sizeof(struct perf_event_header);
         size += ids * sizeof(u64);
 
-        ev = malloc(size);
+        ev = zalloc(size);
 
         if (ev == NULL)
                 return -ENOMEM;
@@ -3747,7 +3754,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))