[tip:perf/urgent] perf: Fix resource leak in failure path of perf_event_open()

Previous thread: Office of Tim Pullen Solicitors & Barristers by kap3watt on Wednesday, April 28, 2010 - 6:18 pm. (1 message)

Next thread: Very Important* by Jiang Jianmin on Saturday, May 1, 2010 - 12:52 am. (1 message)
From: Tejun Heo
Date: Saturday, May 1, 2010 - 1:11 am

perf_event_open() kfrees event after init failure which doesn't
release all resources allocated by perf_event_alloc().  Use
free_event() instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 kernel/perf_event.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: work/kernel/perf_event.c
===================================================================
--- work.orig/kernel/perf_event.c
+++ work/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)
--

From: tip-bot for Tejun Heo
Date: Saturday, May 1, 2010 - 4:54 am

Commit-ID:  048c852051d2bd5da54a4488bc1f16b0fc74c695
Gitweb:     http://git.kernel.org/tip/048c852051d2bd5da54a4488bc1f16b0fc74c695
Author:     Tejun Heo <tj@kernel.org>
AuthorDate: Sat, 1 May 2010 10:11:35 +0200
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Sat, 1 May 2010 13:11:25 +0200

perf: Fix resource leak in failure path of perf_event_open()

perf_event_open() kfrees event after init failure which doesn't
release all resources allocated by perf_event_alloc().  Use
free_event() instead.

Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Paul Mackerras <paulus@au1.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: <stable@kernel.org>
LKML-Reference: <4BDBE237.1040809@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 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 2f3fbf8..3d1552d 100644
--- 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)
--

Previous thread: Office of Tim Pullen Solicitors & Barristers by kap3watt on Wednesday, April 28, 2010 - 6:18 pm. (1 message)

Next thread: Very Important* by Jiang Jianmin on Saturday, May 1, 2010 - 12:52 am. (1 message)