From: Peter Zijlstra <peterz@infradead.org>
To: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>,
linux-kernel@vger.kernel.org, Michael Neuling <mikey@neuling.org>
Subject: Re: [PATCH 1/2] perf_event: Fix incorrect range check on cpu number
Date: Tue, 15 Dec 2009 11:31:32 +0100 [thread overview]
Message-ID: <1260873092.4165.354.camel@twins> (raw)
In-Reply-To: <20091215084032.GA18661@brick.ozlabs.ibm.com>
On Tue, 2009-12-15 at 19:40 +1100, Paul Mackerras wrote:
> 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.
Cute, do you actually have hardware that does this?
> Reported-by: Michael Neuling <mikey@neuling.org>
> Tested-by: Michael Neuling <mikey@neuling.org>
> Cc: stable@kernel.org
> Signed-off-by: Paul Mackerras <paulus@samba.org>
> ---
> kernel/perf_event.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/kernel/perf_event.c b/kernel/perf_event.c
> index 6b7ddba..78551b3 100644
> --- a/kernel/perf_event.c
> +++ b/kernel/perf_event.c
> @@ -1604,7 +1604,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);
>
> /*
next prev parent reply other threads:[~2009-12-15 10:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-15 8:40 [PATCH 1/2] perf_event: Fix incorrect range check on cpu number Paul Mackerras
2009-12-15 10:31 ` Peter Zijlstra [this message]
2009-12-15 11:00 ` Paul Mackerras
2009-12-15 18:54 ` Corey Ashford
2009-12-15 19:08 ` Ingo Molnar
2009-12-15 19:15 ` Corey Ashford
2009-12-15 12:12 ` [tip:perf/urgent] " tip-bot for Paul Mackerras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1260873092.4165.354.camel@twins \
--to=peterz@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mikey@neuling.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox