From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754035AbbCPMHT (ORCPT ); Mon, 16 Mar 2015 08:07:19 -0400 Received: from terminus.zytor.com ([198.137.202.10]:35926 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753915AbbCPMHO (ORCPT ); Mon, 16 Mar 2015 08:07:14 -0400 Date: Mon, 16 Mar 2015 05:06:50 -0700 From: tip-bot for Leon Yu Message-ID: Cc: linux-kernel@vger.kernel.org, paulus@samba.org, tglx@linutronix.de, hpa@zytor.com, acme@kernel.org, a.p.zijlstra@chello.nl, mingo@kernel.org, chianglungyu@gmail.com Reply-To: chianglungyu@gmail.com, mingo@kernel.org, a.p.zijlstra@chello.nl, acme@kernel.org, tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org, paulus@samba.org In-Reply-To: <1424954613-5034-1-git-send-email-chianglungyu@gmail.com> References: <1424954613-5034-1-git-send-email-chianglungyu@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf: Fix context leak in put_event() Git-Commit-ID: d415a7f1c1a8406b22d95b943c66a5b73a37bc19 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: d415a7f1c1a8406b22d95b943c66a5b73a37bc19 Gitweb: http://git.kernel.org/tip/d415a7f1c1a8406b22d95b943c66a5b73a37bc19 Author: Leon Yu AuthorDate: Thu, 26 Feb 2015 20:43:33 +0800 Committer: Ingo Molnar CommitDate: Fri, 13 Mar 2015 10:02:18 +0100 perf: Fix context leak in put_event() Commit: a83fe28e2e45 ("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 Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Peter Zijlstra Fixes: a83fe28e2e45 ("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 --- 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); }