Commit d415a7f1 authored Feb 26, 2015 by Leon Yu Committed by Ingo Molnar Mar 13, 2015

perf: Fix context leak in put_event()



Commit:

  a83fe28e ("perf: Fix put_event() ctx lock")

changed the locking logic in put_event() by replacing mutex_lock_nested()
with perf_event_ctx_lock_nested(), but didn't fix the subsequent
mutex_unlock() with a correct counterpart, perf_event_ctx_unlock().

Contexts are thus leaked as a result of incremented refcount
in perf_event_ctx_lock_nested().

Signed-off-by: Leon Yu <chianglungyu@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Fixes: a83fe28e ("perf: Fix put_event() ctx lock")
Link: http://lkml.kernel.org/r/1424954613-5034-1-git-send-email-chianglungyu@gmail.com


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

parent e678fefa

kernel/events/core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3591,7 +3591,7 @@ static void put_event(struct perf_event *event)
		ctx = perf_event_ctx_lock_nested(event, SINGLE_DEPTH_NESTING);
		WARN_ON_ONCE(ctx->parent_ctx);
		perf_remove_from_context(event, true);
		mutex_unlock(&ctx->mutex);
		perf_event_ctx_unlock(event, ctx);

		_free_event(event);
		}

Admin message