Commit 201c2f85 authored Mar 21, 2016 by Alexander Shishkin Committed by Ingo Molnar Mar 31, 2016

perf/core: Don't leak event in the syscall error path



In the error path, event_file not being NULL is used to determine
whether the event itself still needs to be free'd, so fix it up to
avoid leaking.

Reported-by: Leon Yu <chianglungyu@gmail.com>
Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
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: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Fixes: 13005627 ("perf: Do not double free")
Link: http://lkml.kernel.org/r/87twk06yxp.fsf@ashishki-desk.ger.corp.intel.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 8fdc6539

kernel/events/core.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -8542,6 +8542,7 @@ SYSCALL_DEFINE5(perf_event_open,
		f_flags);
		if (IS_ERR(event_file)) {
		err = PTR_ERR(event_file);
		event_file = NULL;
		goto err_context;
		}

Admin message