summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMarti Raudsepp <marti@juffo.org>2009-06-13 02:35:01 +0300
committerIngo Molnar <mingo@elte.hu>2009-06-13 12:58:24 +0200
commitd5e8da6449d4ef4bac35ea9b9719a2cda02e7b39 (patch)
treee2de81cecc4b72a7ae35624672d878e4c22bb5e9 /kernel
parent87847b8f26cc7176ec9b239898dc7ce47a94e1a6 (diff)
downloadlinux-d5e8da6449d4ef4bac35ea9b9719a2cda02e7b39.tar.gz
linux-d5e8da6449d4ef4bac35ea9b9719a2cda02e7b39.tar.bz2
linux-d5e8da6449d4ef4bac35ea9b9719a2cda02e7b39.zip
perf_counter: Fix stack corruption in perf_read_hw
With PERF_FORMAT_ID, perf_read_hw now needs space for up to 4 values. Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/perf_counter.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index 8d14a733f222..e914daff03b5 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -1553,7 +1553,7 @@ static int perf_release(struct inode *inode, struct file *file)
static ssize_t
perf_read_hw(struct perf_counter *counter, char __user *buf, size_t count)
{
- u64 values[3];
+ u64 values[4];
int n;
/*