From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932221AbbBZMoK (ORCPT ); Thu, 26 Feb 2015 07:44:10 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:38379 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932075AbbBZMoG (ORCPT ); Thu, 26 Feb 2015 07:44:06 -0500 From: Leon Yu To: Peter Zijlstra , Paul Mackerras , Ingo Molnar , Arnaldo Carvalho de Melo Cc: Leon Yu , linux-kernel@vger.kernel.org Subject: [PATCH] perf: fix put_event() ctx leak Date: Thu, 26 Feb 2015 20:43:33 +0800 Message-Id: <1424954613-5034-1-git-send-email-chianglungyu@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit a83fe28e2e45 ("perf: Fix put_event() ctx lock") changed lock logic in put_event() by replacing mutex_lock_nested() with perf_event_ctx_lock_nested(), but didn't fix subsequent mutex_unlock() with correct counterpart, perf_event_ctx_unlock(). ctx is thus leaked as a result of incremented refcount in perf_event_ctx_lock_nested(). Signed-off-by: Leon Yu Fixes: a83fe28e2e45 ("perf: Fix put_event() ctx lock") --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index f04daab..453ef61 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -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); } -- 2.3.1