From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75067C43381 for ; Sat, 30 Mar 2019 00:57:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DDD2218FD for ; Sat, 30 Mar 2019 00:57:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907437; bh=h81ZxdK7e481eEOjTUskkbLLcNeul4LEGqL8joaxtAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CWugT+Nq5rUdlbpO8E0eYInoeCK1/q04W+FdVpHgwyjn6A1CG3AZJmJCQgfS9/gI1 6tkSSGIWtDDrulJZMh2W87Psj8PVnkLdmiExAZEvvWUOMVpnIBSJiU8YbZpoIu6Gyw jrKuv7oey7NECAzHF4rgHnQgwpU/zGb2BoWOIOQ0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732083AbfC3A5P (ORCPT ); Fri, 29 Mar 2019 20:57:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:37224 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731687AbfC3A5M (ORCPT ); Fri, 29 Mar 2019 20:57:12 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7437E218AC; Sat, 30 Mar 2019 00:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553907431; bh=h81ZxdK7e481eEOjTUskkbLLcNeul4LEGqL8joaxtAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gxkt8Snm2ZNHljCnG8Di4Uh5M23Rm1f/hdfuxxKEPr0ytjPTHCamlTnmTmZBvYfEi 00OBikpVeRjb+S8YZS5+Fk3R9WYlnexJk8/U5zy2heuVsdoOY9ubuPfZvJpJWvUbKf uIO2dshzwolrknFqGYx0pzUxg085VeKkIa0W+71Q= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Changbin Du , Alexei Starovoitov , Daniel Borkmann , Namhyung Kim , Peter Zijlstra , Steven Rostedt , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH AUTOSEL 4.4 12/21] perf top: Fix error handling in cmd_top() Date: Fri, 29 Mar 2019 20:56:40 -0400 Message-Id: <20190330005649.28475-12-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190330005649.28475-1-sashal@kernel.org> References: <20190330005649.28475-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Changbin Du [ Upstream commit 70c819e4bf1c5f492768b399d898d458ccdad2b6 ] We should go to the cleanup path, to avoid leaks, detected using gcc's ASan. Signed-off-by: Changbin Du Reviewed-by: Jiri Olsa Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Steven Rostedt (VMware) Link: http://lkml.kernel.org/r/20190316080556.3075-9-changbin.du@gmail.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-top.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 47719bde34c6..4e64ba8163bb 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -1320,8 +1320,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) symbol_conf.priv_size = sizeof(struct annotation); symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL); - if (symbol__init(NULL) < 0) - return -1; + status = symbol__init(NULL); + if (status < 0) + goto out_delete_evlist; sort__setup_elide(stdout); -- 2.19.1