Commit c7993165 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar

x86, perf: P4 PMU -- check for proper event index in RAW events

RAW events are special and we should be ready for user passing
in insane event index values.
Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Lin Ming <ming.m.lin@intel.com>
LKML-Reference: <20100508112717.315897547@openvz.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3f51b711
...@@ -418,6 +418,7 @@ static int p4_hw_config(struct perf_event *event) ...@@ -418,6 +418,7 @@ static int p4_hw_config(struct perf_event *event)
{ {
int cpu = get_cpu(); int cpu = get_cpu();
int rc = 0; int rc = 0;
unsigned int evnt;
u32 escr, cccr; u32 escr, cccr;
/* /*
...@@ -436,6 +437,14 @@ static int p4_hw_config(struct perf_event *event) ...@@ -436,6 +437,14 @@ static int p4_hw_config(struct perf_event *event)
event->hw.config = p4_set_ht_bit(event->hw.config); event->hw.config = p4_set_ht_bit(event->hw.config);
if (event->attr.type == PERF_TYPE_RAW) { if (event->attr.type == PERF_TYPE_RAW) {
/* user data may have out-of-bound event index */
evnt = p4_config_unpack_event(event->attr.config);
if (evnt >= ARRAY_SIZE(p4_event_bind_map)) {
rc = -EINVAL;
goto out;
}
/* /*
* We don't control raw events so it's up to the caller * We don't control raw events so it's up to the caller
* to pass sane values (and we don't count the thread number * to pass sane values (and we don't count the thread number
...@@ -451,8 +460,8 @@ static int p4_hw_config(struct perf_event *event) ...@@ -451,8 +460,8 @@ static int p4_hw_config(struct perf_event *event)
} }
rc = x86_setup_perfctr(event); rc = x86_setup_perfctr(event);
out:
put_cpu(); put_cpu();
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment