From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932087AbcCaJUU (ORCPT ); Thu, 31 Mar 2016 05:20:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:37530 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755875AbcCaJUN (ORCPT ); Thu, 31 Mar 2016 05:20:13 -0400 Date: Thu, 31 Mar 2016 02:19:05 -0700 From: tip-bot for Alexander Shishkin Message-ID: Cc: jolsa@redhat.com, acme@kernel.org, tglx@linutronix.de, vincent.weaver@maine.edu, alexander.shishkin@linux.intel.com, hpa@zytor.com, acme@redhat.com, chianglungyu@gmail.com, linux-kernel@vger.kernel.org, eranian@google.com, mingo@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org Reply-To: hpa@zytor.com, jolsa@redhat.com, acme@kernel.org, tglx@linutronix.de, alexander.shishkin@linux.intel.com, vincent.weaver@maine.edu, eranian@google.com, mingo@kernel.org, torvalds@linux-foundation.org, peterz@infradead.org, acme@redhat.com, linux-kernel@vger.kernel.org, chianglungyu@gmail.com In-Reply-To: <87twk06yxp.fsf@ashishki-desk.ger.corp.intel.com> References: <87twk06yxp.fsf@ashishki-desk.ger.corp.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Don't leak event in the syscall error path Git-Commit-ID: 201c2f85bd0bc13b712d9c0b3d11251b182e06ae 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: 201c2f85bd0bc13b712d9c0b3d11251b182e06ae Gitweb: http://git.kernel.org/tip/201c2f85bd0bc13b712d9c0b3d11251b182e06ae Author: Alexander Shishkin AuthorDate: Mon, 21 Mar 2016 10:02:42 +0200 Committer: Ingo Molnar CommitDate: Thu, 31 Mar 2016 09:54:07 +0200 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 Signed-off-by: Alexander Shishkin Signed-off-by: Peter Zijlstra (Intel) Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Fixes: 130056275ade ("perf: Do not double free") Link: http://lkml.kernel.org/r/87twk06yxp.fsf@ashishki-desk.ger.corp.intel.com Signed-off-by: Ingo Molnar --- kernel/events/core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/events/core.c b/kernel/events/core.c index 8c11388..52bedc5 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -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; }