perf_events: fix resource leak in x86 __hw_perf_event_init()
Subsystems (2)
PATCH 1/1 perf_events: fix resource leak in x86 __hw_perf_event_init()
If reserve_pmc_hardware() succeeds but reserve_ds_buffers() fails, then we need to release_pmc_hardware. It won't be done by the destroy() callback because we return before setting it in case of error.
Signed-off-by Stephane Eranian <[email protected]>
--
perf_event.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/perf_event.c +4 -1
@@ -455,8 +455,11 @@ static int __hw_perf_event_init(struct perf_event *event)if (atomic_read (&active_events) ==0 ) {if (!reserve_pmc_hardware ()) err = -EBUSY ; -else +else { err =reserve_ds_buffers (); +if (err) +release_pmc_hardware (); + } }if (!err)atomic_inc (&active_events);
[tip:perf/core] perf_events: Fix resource leak in x86 __hw_perf_event_init()
Commit-ID: 4b24a88b35e15e04bd8f2c5dda65b5dc8ebca05f Gitweb: http://git.kernel.org/tip/4b24a88b35e15e04bd8f2c5dda65b5dc8ebca05f Author: Stephane Eranian <[email protected]> AuthorDate: Wed, 17 Mar 2010 23:21:01 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 18 Mar 2010 18:39:40 +0100
perf_events: Fix resource leak in x86 __hw_perf_event_init()
If reserve_pmc_hardware() succeeds but reserve_ds_buffers() fails, then we need to release_pmc_hardware. It won't be done by the destroy() callback because we return before setting it in case of error.
Signed-off-by Stephane Eranian <[email protected]>
Cc <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--
arch/x86/kernel/cpu/perf_event.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- arch/x86/kernel/cpu/perf_event.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
arch/x86/kernel/cpu/perf_event.c +4 -1
@@ -455,8 +455,11 @@ static int __hw_perf_event_init(struct perf_event *event)if (atomic_read (&active_events) ==0 ) {if (!reserve_pmc_hardware ()) err = -EBUSY ; -else +else { err =reserve_ds_buffers (); +if (err) +release_pmc_hardware (); + } }if (!err)atomic_inc (&active_events);