Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf_counter: Fix buffer overflow in perf_copy_attr()
diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index e0d91fd..e7f60f8 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -4215,6 +4215,7 @@
if (val)
goto err_size;
}
+ size = sizeof(*attr);
}
ret = copy_from_user(attr, uattr, size);