From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754874AbdGVHh1 (ORCPT ); Sat, 22 Jul 2017 03:37:27 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:29482 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752338AbdGVHhZ (ORCPT ); Sat, 22 Jul 2017 03:37:25 -0400 Date: Sat, 22 Jul 2017 10:36:10 +0300 From: Dan Carpenter To: Peter Zijlstra , Ingo Molnar Cc: Arnaldo Carvalho de Melo , Alexander Shishkin , linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] perf script: remove some bogus error handling Message-ID: <20170722073610.nnsyiwdcfl6bhn4t@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Mailer: git-send-email haha only kidding User-Agent: NeoMutt/20170609 (1.8.3) X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If script_desc__new() fails then the current code has a NULL dereference. We don't actually need to do any cleanup, we can just return NULL. Signed-off-by: Dan Carpenter diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 83cdc0a61fd6..89ea2bc9b9be 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -2199,16 +2199,11 @@ static struct script_desc *script_desc__findnew(const char *name) s = script_desc__new(name); if (!s) - goto out_delete_desc; + return NULL; script_desc__add(s); return s; - -out_delete_desc: - script_desc__delete(s); - - return NULL; } static const char *ends_with(const char *str, const char *suffix)