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 3B599C43381 for ; Thu, 21 Mar 2019 18:53:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 10E1A21916 for ; Thu, 21 Mar 2019 18:53:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553194427; bh=lPd4PeaIXRJXQfhugh/ykuKSsLOz9uwRAv/3UlF8tRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RmVO7Q0J9di9OzCQ0IF8DQB+51ZoyuQ/cZ7TiQpg0jjuBnLRLkMetWZcvDQ6l7Ipx KiAvNYzEMcN/n/nCkNkhYEnPhgfRxpmk1+S4kUoExGD7PR4fr8YDldx4MAFPtYlbLh zSCXPg5QjyvLhS4qkCPGAJd7G/d/v1EcOSqY7Zpo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729007AbfCUSxp (ORCPT ); Thu, 21 Mar 2019 14:53:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:45486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728657AbfCUSxo (ORCPT ); Thu, 21 Mar 2019 14:53:44 -0400 Received: from quaco.ghostprotocols.net (unknown [190.15.121.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6310D21917; Thu, 21 Mar 2019 18:53:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553194423; bh=lPd4PeaIXRJXQfhugh/ykuKSsLOz9uwRAv/3UlF8tRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mSZ36TZUODcabUA0VWqW0FRkWQkbbGnMfoDxcIQAcbfdedPqLkOWNRxKiWaVZa4tT A+bYcCedhZ/xdzkwarlqEJl8JO5NzCH4sHxPqyfF1Wp+0zSO3+G1YDgutgd3ieovD1 Oqi8/Fy1gVyY1RVM9SnHo3p06WGOCJUTegAECAi4= From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Changbin Du , Alexei Starovoitov , Daniel Borkmann , Krister Johansen , Peter Zijlstra , Steven Rostedt , Arnaldo Carvalho de Melo Subject: [PATCH 18/44] perf hist: Add missing map__put() in error case Date: Thu, 21 Mar 2019 15:51:16 -0300 Message-Id: <20190321185142.11441-19-acme@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190321185142.11441-1-acme@kernel.org> References: <20190321185142.11441-1-acme@kernel.org> MIME-Version: 1.0 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 We need to map__put() before returning from failure of sample__resolve_callchain(). Detected with gcc's ASan. Signed-off-by: Changbin Du Reviewed-by: Jiri Olsa Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Krister Johansen Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Steven Rostedt (VMware) Fixes: 9c68ae98c6f7 ("perf callchain: Reference count maps") Link: http://lkml.kernel.org/r/20190316080556.3075-10-changbin.du@gmail.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/hist.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 1f230285d78a..7ace7a10054d 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -1111,8 +1111,10 @@ int hist_entry_iter__add(struct hist_entry_iter *iter, struct addr_location *al, err = sample__resolve_callchain(iter->sample, &callchain_cursor, &iter->parent, iter->evsel, al, max_stack_depth); - if (err) + if (err) { + map__put(alm); return err; + } err = iter->ops->prepare_entry(iter, al); if (err) -- 2.20.1