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()

1 files changed, 1 insertions, 0 deletions

diff --git a/kernel/perf_counter.c b/kernel/perf_counter.c
index e0d91fdf0c3c..e7f60f8e31ed 100644
--- a/kernel/perf_counter.c
+++ b/kernel/perf_counter.c
@@ -4215,6 +4215,7 @@ static int perf_copy_attr(struct perf_counter_attr __user *uattr,
                         if (val)
                                 goto err_size;
                 }
+                size = sizeof(*attr);
         }
 
         ret = copy_from_user(attr, uattr, size);