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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 53DD4C10DCE for ; Wed, 18 Mar 2020 10:28:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 23AF42077E for ; Wed, 18 Mar 2020 10:28:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="YwI3ICDB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727680AbgCRK2k (ORCPT ); Wed, 18 Mar 2020 06:28:40 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:38246 "EHLO us-smtp-delivery-74.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726310AbgCRK2k (ORCPT ); Wed, 18 Mar 2020 06:28:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584527318; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=PGKLclenbI39quMEPl05MorFbpQyKzJYu66lEEU5Ra4=; b=YwI3ICDBk12nql7YX/UV1+bl4TUChYrwCZkbOcYoPuSAmXxEXTa4qa3cNYA6y11XbL8kWn uzL38bA56y9dv4rstx90uIihKSsgQ5iE2LOplT1+YXWM2GjmV+nuq2QXsL0keR2PBX3VOf IqeD1AUYwxoe+Az36wEtj184/RjX08k= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-282-eEmGDc06PfSY7KkeWDVF1g-1; Wed, 18 Mar 2020 06:28:34 -0400 X-MC-Unique: eEmGDc06PfSY7KkeWDVF1g-1 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id F2BD9A0CBF; Wed, 18 Mar 2020 10:28:32 +0000 (UTC) Received: from krava (unknown [10.40.195.82]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3263219C58; Wed, 18 Mar 2020 10:28:30 +0000 (UTC) Date: Wed, 18 Mar 2020 11:28:27 +0100 From: Jiri Olsa To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Namhyung Kim , Andi Kleen , Adrian Hunter , Leo Yan , linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Stephane Eranian Subject: Re: [PATCH v2] perf parse-events: fix 3 use after frees Message-ID: <20200318102827.GD821557@krava> References: <20200314170356.62914-1-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200314170356.62914-1-irogers@google.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Mar 14, 2020 at 10:03:56AM -0700, Ian Rogers wrote: > Reproducible with a clang asan build and then running perf test in > particular 'Parse event definition strings'. > > v2 frees the evsel->pmu_name avoiding a memory leak. > > Signed-off-by: Ian Rogers Acked-by: Jiri Olsa thanks, jirka > --- > tools/perf/util/evsel.c | 1 + > tools/perf/util/parse-events.c | 6 +++--- > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c > index 816d930d774e..15ccd193483f 100644 > --- a/tools/perf/util/evsel.c > +++ b/tools/perf/util/evsel.c > @@ -1287,6 +1287,7 @@ void perf_evsel__exit(struct evsel *evsel) > perf_thread_map__put(evsel->core.threads); > zfree(&evsel->group_name); > zfree(&evsel->name); > + zfree(&evsel->pmu_name); > perf_evsel__object.fini(evsel); > } > > diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c > index a14995835d85..593b6b03785d 100644 > --- a/tools/perf/util/parse-events.c > +++ b/tools/perf/util/parse-events.c > @@ -1449,7 +1449,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, > evsel = __add_event(list, &parse_state->idx, &attr, NULL, pmu, NULL, > auto_merge_stats, NULL); > if (evsel) { > - evsel->pmu_name = name; > + evsel->pmu_name = name ? strdup(name) : NULL; > evsel->use_uncore_alias = use_uncore_alias; > return 0; > } else { > @@ -1497,7 +1497,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, > evsel->snapshot = info.snapshot; > evsel->metric_expr = info.metric_expr; > evsel->metric_name = info.metric_name; > - evsel->pmu_name = name; > + evsel->pmu_name = name ? strdup(name) : NULL; > evsel->use_uncore_alias = use_uncore_alias; > evsel->percore = config_term_percore(&evsel->config_terms); > } > @@ -1547,7 +1547,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, > if (!parse_events_add_pmu(parse_state, list, > pmu->name, head, > true, true)) { > - pr_debug("%s -> %s/%s/\n", config, > + pr_debug("%s -> %s/%s/\n", str, > pmu->name, alias->str); > ok++; > } > -- > 2.25.1.481.gfbce0eb801-goog >