diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 18:16:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-04 18:16:15 -0400 |
| commit | f5fa05d97252b23b12749a7cd02710870c0762b0 (patch) | |
| tree | e7c5e2c78a186bd66c63a7eeb61005f5ba90f7f4 /kernel | |
| parent | f2809d61d6cf47c2ed2963ba3b4c59e709144ccb (diff) | |
| parent | 048c852051d2bd5da54a4488bc1f16b0fc74c695 (diff) | |
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Fix resource leak in failure path of perf_event_open()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 2f3fbf84215..3d1552d3c12 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -4897,7 +4897,7 @@ err_fput_free_put_context: | |||
| 4897 | 4897 | ||
| 4898 | err_free_put_context: | 4898 | err_free_put_context: |
| 4899 | if (err < 0) | 4899 | if (err < 0) |
| 4900 | kfree(event); | 4900 | free_event(event); |
| 4901 | 4901 | ||
| 4902 | err_put_context: | 4902 | err_put_context: |
| 4903 | if (err < 0) | 4903 | if (err < 0) |