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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 1F413C432C1 for ; Tue, 24 Sep 2019 07:50:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDBBC214DA for ; Tue, 24 Sep 2019 07:50:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394710AbfIXHun (ORCPT ); Tue, 24 Sep 2019 03:50:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39562 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391780AbfIXHum (ORCPT ); Tue, 24 Sep 2019 03:50:42 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 588C8C049D59; Tue, 24 Sep 2019 07:50:42 +0000 (UTC) Received: from krava (unknown [10.43.17.52]) by smtp.corp.redhat.com (Postfix) with SMTP id 343E1196AE; Tue, 24 Sep 2019 07:50:41 +0000 (UTC) Date: Tue, 24 Sep 2019 09:50:40 +0200 From: Jiri Olsa To: Andi Kleen Cc: acme@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: Re: [PATCH 3/3] perf, stat: Fix free memory access / memory leaks in metrics Message-ID: <20190924075040.GC26797@krava> References: <20190923233339.25326-1-andi@firstfloor.org> <20190923233339.25326-3-andi@firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190923233339.25326-3-andi@firstfloor.org> User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 24 Sep 2019 07:50:42 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 23, 2019 at 04:33:39PM -0700, Andi Kleen wrote: > From: Andi Kleen > > Make sure to not free the name passed in by the caller, but free > all the allocated ids when parsing expressions. > > The loop at the end knows that the first entry shouldn't be freed, > so make sure the caller name is the first entry. > > Fixes > > % perf stat -M IpB,IpCall,IpTB,IPC,Retiring_SMT,Frontend_Bound_SMT,Kernel_Utilization,CPU_Utilization --metric-only -a -I 1000 sleep 2 > > valgrind: > 1.009943231 ==21527== Invalid read of size 1 > ==21527== at 0x483CB74: strcmp (vg_replace_strmem.c:849) > ==21527== by 0x582CF8: collect_all_aliases (stat-display.c:554) > ==21527== by 0x582EB3: collect_data (stat-display.c:577) > ==21527== by 0x583A32: print_counter_aggr (stat-display.c:806) > ==21527== by 0x584FAD: perf_evlist__print_counters (stat-display.c:1200) > ==21527== by 0x45133A: print_counters (builtin-stat.c:655) > ==21527== by 0x450629: process_interval (builtin-stat.c:353) > ==21527== by 0x450FBD: __run_perf_stat (builtin-stat.c:564) > ==21527== by 0x451285: run_perf_stat (builtin-stat.c:636) > ==21527== by 0x454619: cmd_stat (builtin-stat.c:1966) > ==21527== by 0x4D557D: run_builtin (perf.c:310) > ==21527== by 0x4D57EA: handle_internal_command (perf.c:362) > ==21527== Address 0x12826cd0 is 0 bytes inside a block of size 25 free'd > ==21527== at 0x4839A0C: free (vg_replace_malloc.c:540) > ==21527== by 0x627041: __zfree (zalloc.c:13) > ==21527== by 0x57F66A: generic_metric (stat-shadow.c:814) > ==21527== by 0x580B21: perf_stat__print_shadow_stats (stat-shadow.c:1057) > ==21527== by 0x58418E: print_metric_headers (stat-display.c:943) > ==21527== by 0x5844BC: print_interval (stat-display.c:1004) > ==21527== by 0x584DEB: perf_evlist__print_counters (stat-display.c:1172) > ==21527== by 0x45133A: print_counters (builtin-stat.c:655) > ==21527== by 0x450629: process_interval (builtin-stat.c:353) > ==21527== by 0x450FBD: __run_perf_stat (builtin-stat.c:564) > ==21527== by 0x451285: run_perf_stat (builtin-stat.c:636) > ==21527== by 0x454619: cmd_stat (builtin-stat.c:1966) > ==21527== Block was alloc'd at > ==21527== at 0x483880B: malloc (vg_replace_malloc.c:309) > ==21527== by 0x51677DE: strdup (in /usr/lib64/libc-2.29.so) > ==21527== by 0x506457: parse_events_name (parse-events.c:1754) > ==21527== by 0x5550BB: parse_events_parse (parse-events.y:214) > ==21527== by 0x50694D: parse_events__scanner (parse-events.c:1887) > ==21527== by 0x506AEF: parse_events (parse-events.c:1927) > ==21527== by 0x521D8B: metricgroup__parse_groups (metricgroup.c:527) > ==21527== by 0x45156F: parse_metric_groups (builtin-stat.c:721) > ==21527== by 0x6228A9: get_value (parse-options.c:243) > ==21527== by 0x62363F: parse_short_opt (parse-options.c:348) > ==21527== by 0x62363F: parse_options_step (parse-options.c:536) > ==21527== by 0x62363F: parse_options_subcommand (parse-options.c:651) > ==21527== by 0x453C1D: cmd_stat (builtin-stat.c:1718) > ==21527== by 0x4D557D: run_builtin (perf.c:310) > > and also a leak report. > > Signed-off-by: Andi Kleen > --- > tools/perf/util/stat-shadow.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c > index 70c87fdb2a43..2c41d47f6f83 100644 > --- a/tools/perf/util/stat-shadow.c > +++ b/tools/perf/util/stat-shadow.c > @@ -738,6 +738,8 @@ static void generic_metric(struct perf_stat_config *config, > char *n, *pn; > > expr__ctx_init(&pctx); > + /* Must be first id entry */ > + expr__add_id(&pctx, name, avg); hum, shouldn't u instead use strdup(name) instead of name? jirka > for (i = 0; metric_events[i]; i++) { > struct saved_value *v; > struct stats *stats; > @@ -776,8 +778,6 @@ static void generic_metric(struct perf_stat_config *config, > expr__add_id(&pctx, n, avg_stats(stats)*scale); > } > > - expr__add_id(&pctx, name, avg); > - > if (!metric_events[i]) { > const char *p = metric_expr; > > -- > 2.21.0 >