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()
This commit is contained in:
Linus Torvalds 2009-09-15 09:34:27 -07:00
commit f199fd9906

View file

@ -4215,6 +4215,7 @@ static int perf_copy_attr(struct perf_counter_attr __user *uattr,
if (val) if (val)
goto err_size; goto err_size;
} }
size = sizeof(*attr);
} }
ret = copy_from_user(attr, uattr, size); ret = copy_from_user(attr, uattr, size);