Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13005627 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

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: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarAlexander 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: default avatarIngo Molnar <mingo@kernel.org>
parent 84c4e620

kernel/events/core.c

+6 −1
Original line number Diff line number Diff line
@@ -8520,6 +8520,11 @@ SYSCALL_DEFINE5(perf_event_open, 
	perf_unpin_context(ctx);

	put_ctx(ctx);

err_alloc:

	/*

	 * 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();