[stable] Patch Upstream: oprofile, ARM: Release resources on failure
From: Greg KH <hidden>
Date: 2010-10-29 20:58:29
This patch doesn't apply to the .35 or .36 stable tree If someone wants it applied there, please email the backport to stable at kernel.org thanks, greg k-h
quoted hunk
commit: 81771974ae49bf79aab60c42eac7a6d730a9ef2b From: Robert Richter <redacted> Date: Wed, 29 Sep 2010 16:52:25 +0200 Subject: [PATCH] oprofile, ARM: Release resources on failure This patch fixes a resource leak on failure, where the oprofilefs and some counters may not released properly. Signed-off-by: Robert Richter <redacted> Acked-by: Will Deacon <redacted> Cc: linux-arm-kernel at lists.infradead.org Cc: <stable@kernel.org> # .35.x LKML-Reference: [off-list ref] Signed-off-by: Ingo Molnar <redacted> --- drivers/oprofile/oprofile_perf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)diff --git a/drivers/oprofile/oprofile_perf.c b/drivers/oprofile/oprofile_perf.c index ebb40cb..f3d3df2 100644 --- a/drivers/oprofile/oprofile_perf.c +++ b/drivers/oprofile/oprofile_perf.c@@ -84,6 +84,7 @@ static int op_create_counter(int cpu, int event) if (IS_ERR(pevent)) { ret = PTR_ERR(pevent); } else if (pevent->state != PERF_EVENT_STATE_ACTIVE) { + perf_event_release_kernel(pevent); pr_warning("oprofile: failed to enable event %d " "on CPU %d\n", event, cpu); ret = -EBUSY;_______________________________________________ stable mailing list stable at linux.kernel.org http://linux.kernel.org/mailman/listinfo/stable