diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:34:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 12:34:27 -0400 |
| commit | f199fd990639f93d07d8e104b0a66aabaf01d67d (patch) | |
| tree | 268fe35b46db1e1c28443c567e445e2ffdc61e39 /kernel/perf_counter.c | |
| parent | 043fe50f8085c12651c96f04576eae4d8a22f3d8 (diff) | |
| parent | b3e62e35058fc744ac794611f4e79bcd1c5a4b83 (diff) | |
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()
Diffstat (limited to 'kernel/perf_counter.c')
| -rw-r--r-- | kernel/perf_counter.c | 1 |
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, | |||
| 4215 | if (val) | 4215 | if (val) |
| 4216 | goto err_size; | 4216 | goto err_size; |
| 4217 | } | 4217 | } |
| 4218 | size = sizeof(*attr); | ||
| 4218 | } | 4219 | } |
| 4219 | 4220 | ||
| 4220 | ret = copy_from_user(attr, uattr, size); | 4221 | ret = copy_from_user(attr, uattr, size); |