Skip to content

Commit

Permalink
arm/mach-vexpress: array accessed out of bounds
Browse files Browse the repository at this point in the history
dcscb_allcpus_mask is an array of size 2.

The index variable cluster has to be checked against this limit
before accessing the array.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Pawel Moll <pawel.moll@arm.com>
  • Loading branch information
Heinrich Schuchardt authored and Pawel Moll committed Apr 24, 2014
1 parent 6b4ed8b commit bb6dd57
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions arch/arm/mach-vexpress/dcscb.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,14 @@ static int dcscb_allcpus_mask[2];
static int dcscb_power_up(unsigned int cpu, unsigned int cluster)
{
unsigned int rst_hold, cpumask = (1 << cpu);
unsigned int all_mask = dcscb_allcpus_mask[cluster];
unsigned int all_mask;

pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
if (cpu >= 4 || cluster >= 2)
return -EINVAL;

all_mask = dcscb_allcpus_mask[cluster];

/*
* Since this is called with IRQs enabled, and no arch_spin_lock_irq
* variant exists, we need to disable IRQs manually here.
Expand Down Expand Up @@ -101,11 +103,12 @@ static void dcscb_power_down(void)
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
cpumask = (1 << cpu);
all_mask = dcscb_allcpus_mask[cluster];

pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
BUG_ON(cpu >= 4 || cluster >= 2);

all_mask = dcscb_allcpus_mask[cluster];

__mcpm_cpu_going_down(cpu, cluster);

arch_spin_lock(&dcscb_lock);
Expand Down

0 comments on commit bb6dd57

Please sign in to comment.