perf tools: Fix type for evsel->ids and add size check for ids
authorRobert Richter <robert.richter@amd.com>
Thu, 16 Aug 2012 19:10:17 +0000 (21:10 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 17 Aug 2012 15:38:07 +0000 (12:38 -0300)
Use same type for ids everywhere.

In case of writing to perf.data the size is u32. In pipe mode it is
limited to header.size (less than u16). Adding a size check here.

Size overflow due to casting shouldn't actually happen in practice, but
during development this may cause type missmatch warninngs/errors,
unifying types avoids this.

Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1345144224-27280-2-git-send-email-robert.richter@amd.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/evsel.h
tools/perf/util/header.c
tools/perf/util/header.h

index 65f39fdf821a4e75b15d946c40ca0c5286b96ee5..94f6ba16747f111e6fbce69eebdd0660f9202c7e 100644 (file)
@@ -53,7 +53,7 @@ struct perf_evsel {
        u64                     *id;
        struct perf_counts      *counts;
        int                     idx;
-       int                     ids;
+       u32                     ids;
        struct hists            hists;
        char                    *name;
        struct event_format     *tp_format;
index 77832b807eff3d09825b3f16c7c904081cec4ba0..471b0c42db3f28573a86e8d3abc55ded2e3b19fe 100644 (file)
@@ -2240,7 +2240,7 @@ out_delete_evlist:
 }
 
 int perf_event__synthesize_attr(struct perf_tool *tool,
-                               struct perf_event_attr *attr, u16 ids, u64 *id,
+                               struct perf_event_attr *attr, u32 ids, u64 *id,
                                perf_event__handler_t process)
 {
        union perf_event *ev;
@@ -2261,9 +2261,12 @@ int perf_event__synthesize_attr(struct perf_tool *tool,
        memcpy(ev->attr.id, id, ids * sizeof(u64));
 
        ev->attr.header.type = PERF_RECORD_HEADER_ATTR;
-       ev->attr.header.size = size;
+       ev->attr.header.size = (u16)size;
 
-       err = process(tool, ev, NULL, NULL);
+       if (ev->attr.header.size == size)
+               err = process(tool, ev, NULL, NULL);
+       else
+               err = -E2BIG;
 
        free(ev);
 
@@ -2292,7 +2295,7 @@ int perf_event__synthesize_attrs(struct perf_tool *tool,
 int perf_event__process_attr(union perf_event *event,
                             struct perf_evlist **pevlist)
 {
-       unsigned int i, ids, n_ids;
+       u32 i, ids, n_ids;
        struct perf_evsel *evsel;
        struct perf_evlist *evlist = *pevlist;
 
index 2d42b3e1826ff998534b3f949b48fc7c902bc0a1..24962e707e5bd3148bba741bb4a108b910989266 100644 (file)
@@ -99,7 +99,7 @@ int build_id_cache__add_s(const char *sbuild_id, const char *debugdir,
 int build_id_cache__remove_s(const char *sbuild_id, const char *debugdir);
 
 int perf_event__synthesize_attr(struct perf_tool *tool,
-                               struct perf_event_attr *attr, u16 ids, u64 *id,
+                               struct perf_event_attr *attr, u32 ids, u64 *id,
                                perf_event__handler_t process);
 int perf_event__synthesize_attrs(struct perf_tool *tool,
                                 struct perf_session *session,