diff options
author | Peter Zijlstra <peterz@infradead.org> | 2014-05-15 20:23:48 +0200 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2014-06-09 13:29:13 +0100 |
commit | 460d3798efac751ebe1f1b13ecbfc5a9b2d8ff91 (patch) | |
tree | 84387621e5440d1a409b2d7763902500c0e05ee2 /kernel | |
parent | 512c19f974ef38ace2b8b1f1101dadf36771d29b (diff) | |
download | linux-stable-460d3798efac751ebe1f1b13ecbfc5a9b2d8ff91.tar.gz linux-stable-460d3798efac751ebe1f1b13ecbfc5a9b2d8ff91.tar.bz2 linux-stable-460d3798efac751ebe1f1b13ecbfc5a9b2d8ff91.zip |
perf: Limit perf_event_attr::sample_period to 63 bits
commit 0819b2e30ccb93edf04876237b6205eef84ec8d2 upstream.
Vince reported that using a large sample_period (one with bit 63 set)
results in wreckage since while the sample_period is fundamentally
unsigned (negative periods don't make sense) the way we implement
things very much rely on signed logic.
So limit sample_period to 63 bits to avoid tripping over this.
Reported-by: Vince Weaver <vincent.weaver@maine.edu>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-p25fhunibl4y3qi0zuqmyf4b@git.kernel.org
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/events/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index b15b4f75131d..f04d7b65e217 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6301,6 +6301,9 @@ SYSCALL_DEFINE5(perf_event_open, if (attr.freq) { if (attr.sample_freq > sysctl_perf_event_sample_rate) return -EINVAL; + } else { + if (attr.sample_period & (1ULL << 63)) + return -EINVAL; } /* |