diff options
| author | Pawel Moll <pawel.moll@arm.com> | 2016-08-05 15:07:10 +0100 |
|---|---|---|
| committer | Sasha Levin <alexander.levin@verizon.com> | 2016-10-02 12:49:25 -0400 |
| commit | b9d45ce394727a6fff3eb02c525d8bca031a3f89 (patch) | |
| tree | e654eed7d23c4c0c44ba11a860efbd17c09667cc /drivers/bus | |
| parent | 0dd4c68f4a9d5629fdb3e966a25bb52461c0970e (diff) | |
bus: arm-ccn: Do not attempt to configure XPs for cycle counter
[ Upstream commit b7c1beb278e8e3dc664ed3df3fc786db126120a9 ]
Fuzzing the CCN perf driver revealed a small but definitely dangerous
mistake in the event setup code. When a cycle counter is requested, the
driver should not reconfigure the events bus at all, otherwise it will
corrupt (in most but the simplest cases) its configuration and may end
up accessing XP array out of its bounds and corrupting control
registers.
Reported-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Cc: stable@vger.kernel.org # 3.17+
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/arm-ccn.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c index 60397ec77ff7..bf2092c85c98 100644 --- a/drivers/bus/arm-ccn.c +++ b/drivers/bus/arm-ccn.c @@ -804,6 +804,10 @@ static void arm_ccn_pmu_xp_dt_config(struct perf_event *event, int enable) struct arm_ccn_component *xp; u32 val, dt_cfg; + /* Nothing to do for cycle counter */ + if (hw->idx == CCN_IDX_PMU_CYCLE_COUNTER) + return; + if (CCN_CONFIG_TYPE(event->attr.config) == CCN_TYPE_XP) xp = &ccn->xp[CCN_CONFIG_XP(event->attr.config)]; else |