Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

torvalds · torvalds · commit f199fd990639 · 2009-09-15T09:34:27.000-07:00
* '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
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -4215,6 +4215,7 @@ static int perf_copy_attr(struct perf_counter_attr __user *uattr,`
`4215`	`4215`	`if (val)`
`4216`	`4216`	`goto err_size;`
`4217`	`4217`	`}`
	`4218`	`+ size = sizeof(*attr);`
`4218`	`4219`	`}`
`4219`	`4220`
`4220`	`4221`	`ret = copy_from_user(attr, uattr, size);`