Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f624e7e authored by Paul Mackerras's avatar Paul Mackerras Committed by Ingo Molnar
Browse files

perf_event: Fix incorrect range check on cpu number 



It is quite legitimate for CPUs to be numbered sparsely, meaning
that it possible for an online CPU to have a number which is
greater than the total count of possible CPUs.

Currently find_get_context() has a sanity check on the cpu
number where it checks it against num_possible_cpus().  This
test can fail for a legitimate cpu number if the
cpu_possible_mask is sparsely populated.

This fixes the problem by checking the CPU number against
nr_cpumask_bits instead, since that is the appropriate check to
ensure that the cpu number is same to pass to cpu_isset()
subsequently.

Reported-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
Tested-by: default avatarMichael Neuling <mikey@neuling.org>
Acked-by: default avatarPeter Zijlstra <peterz@infradead.org>
Cc: <stable@kernel.org>
LKML-Reference: <20091215084032.GA18661@brick.ozlabs.ibm.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a6005123

kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -1603,7 +1603,7 @@ static struct perf_event_context *find_get_context(pid_t pid, int cpu) 
		if (perf_paranoid_cpu() && !capable(CAP_SYS_ADMIN))

			return ERR_PTR(-EACCES);



		if (cpu < 0 || cpu > num_possible_cpus())

		if (cpu < 0 || cpu >= nr_cpumask_bits)

			return ERR_PTR(-EINVAL);



		/*