[patch 4/4] x86,perf: P4 PMU -- check for proper event index in RAW events
in [Kernel]
|
Prev: [patch 0/4] perf,p4 series for -tip
Next: [patch 3/4] x86,perf: P4 PMU -- Get rid of redundant check for array index
From: Cyrill Gorcunov on 8 May 2010 07:30 RAW events are special and we should be ready for user passing insane event index. CC: Peter Zijlstra <peterz(a)infradead.org> CC: Ingo Molnar <mingo(a)elte.hu> CC: Frederic Weisbecker <fweisbec(a)gmail.com> CC: Lin Ming <ming.m.lin(a)intel.com> Signed-off-by: Cyrill Gorcunov <gorcunov(a)openvz.org> --- arch/x86/kernel/cpu/perf_event_p4.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Index: linux-2.6.git/arch/x86/kernel/cpu/perf_event_p4.c ===================================================================== --- linux-2.6.git.orig/arch/x86/kernel/cpu/perf_event_p4.c +++ linux-2.6.git/arch/x86/kernel/cpu/perf_event_p4.c @@ -418,6 +418,7 @@ static int p4_hw_config(struct perf_even { int cpu = get_cpu(); int rc = 0; + unsigned int evnt; u32 escr, cccr; /* @@ -436,6 +437,14 @@ static int p4_hw_config(struct perf_even event->hw.config = p4_set_ht_bit(event->hw.config); 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 * to pass sane values (and we don't count the thread number @@ -451,8 +460,8 @@ static int p4_hw_config(struct perf_even } rc = x86_setup_perfctr(event); +out: put_cpu(); - return rc; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |