git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
f2809d6
)
Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 4 May 2010 22:16:15 +0000
(15:16 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 4 May 2010 22:16:15 +0000
(15:16 -0700)
* '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()
kernel/perf_event.c
patch
|
blob
|
history
diff --git
a/kernel/perf_event.c
b/kernel/perf_event.c
index
2f3fbf8
..
3d1552d
100644
(file)
--- a/
kernel/perf_event.c
+++ b/
kernel/perf_event.c
@@
-4897,7
+4897,7
@@
err_fput_free_put_context:
err_free_put_context:
if (err < 0)
-
kfree
(event);
+
free_event
(event);
err_put_context:
if (err < 0)