From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756029AbcCTPxU (ORCPT ); Sun, 20 Mar 2016 11:53:20 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35855 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753484AbcCTPxJ (ORCPT ); Sun, 20 Mar 2016 11:53:09 -0400 From: Leon Yu To: linux-kernel@vger.kernel.org Cc: Leon Yu , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Subject: [PATCH] perf: fix event leak when perf_event_open() failed to create event_file Date: Sun, 20 Mar 2016 23:52:15 +0800 Message-Id: <1458489135-5016-1-git-send-email-chianglungyu@gmail.com> X-Mailer: git-send-email 2.5.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If something went wrong in anon_inode_getfile, event_file will be set to non-zero error number and able to bypass the NULL test afterward. Consolidate the error path by testing event_file with handly IS_ERR_OR_NULL() helper since we do want to free event in both cases. Signed-off-by: Leon Yu Fixes: 130056275ade ("perf: Do not double free") Cc: # v4.5 --- 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 6146148..5f2e19f 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8617,7 +8617,7 @@ err_alloc: * If event_file is set, the fput() above will have called ->release() * and that will take care of freeing the event. */ - if (!event_file) + if (IS_ERR_OR_NULL(event_file)) free_event(event); err_cpus: put_online_cpus(); -- 2.7.1