Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1342936

[tip:perf/urgent] perf: Do not double free

Show all headers | View raw

Commit-ID:  130056275ade730e7a79c110212c8815202773ee
Gitweb:     http://git.kernel.org/tip/130056275ade730e7a79c110212c8815202773ee
Author:     Peter Zijlstra <peterz@infradead.org>
AuthorDate: Wed, 24 Feb 2016 18:45:41 +0100
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 25 Feb 2016 08:42:32 +0100

perf: Do not double free

In case of: err_file: fput(event_file), we'll end up calling
perf_release() which in turn will free the event.

Do not then free the event _again_.

Tested-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: dvyukov@google.com
Cc: eranian@google.com
Cc: oleg@redhat.com
Cc: panand@redhat.com
Cc: sasha.levin@oracle.com
Cc: vince@deater.net
Link: http://lkml.kernel.org/r/20160224174947.697350349@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/events/core.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index d7b0316..211a5ce 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -8520,7 +8520,12 @@ err_context:
 	perf_unpin_context(ctx);
 	put_ctx(ctx);
 err_alloc:
-	free_event(event);
+	/*
+	 * If event_file is set, the fput() above will have called ->release()
+	 * and that will take care of freeing the event.
+	 */
+	if (!event_file)
+		free_event(event);
 err_cpus:
 	put_online_cpus();
 err_task:

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/12] perf: more fixes Peter Zijlstra <peterz@infradead.org> - 2016-02-24 19:00 +0100
  [PATCH 09/12] perf: Fix scaling vs enable_on_exec Peter Zijlstra <peterz@infradead.org> - 2016-02-24 19:00 +0100
    [tip:perf/urgent] perf: Fix scaling vs. perf_event_enable_on_exec() tip-bot for Peter Zijlstra <tipbot@zytor.com> - 2016-02-25 09:10 +0100
  [PATCH 02/12] perf: Do not double free Peter Zijlstra <peterz@infradead.org> - 2016-02-24 19:00 +0100
    [tip:perf/urgent] perf: Do not double free tip-bot for Peter Zijlstra <tipbot@zytor.com> - 2016-02-25 09:10 +0100
  [PATCH 07/12] perf: Cure event->pending_disable race Peter Zijlstra <peterz@infradead.org> - 2016-02-24 19:00 +0100
    [tip:perf/urgent] perf: Cure event->pending_disable race tip-bot for Peter Zijlstra <tipbot@zytor.com> - 2016-02-25 09:10 +0100

csiph-web