Commit f199fd99 authored Sep 15, 2009 by Linus Torvalds

Merge branch 'perfcounters-fixes-for-linus' of...

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

parents 043fe50f b3e62e35

kernel/perf_counter.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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);