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=-17.4 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 8A683CA9EA0 for ; Fri, 25 Oct 2019 18:09:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 579762070B for ; Fri, 25 Oct 2019 18:09:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="TE1I8ODd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387984AbfJYSJg (ORCPT ); Fri, 25 Oct 2019 14:09:36 -0400 Received: from mail-pg1-f201.google.com ([209.85.215.201]:44949 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387611AbfJYSI7 (ORCPT ); Fri, 25 Oct 2019 14:08:59 -0400 Received: by mail-pg1-f201.google.com with SMTP id k23so2349903pgl.11 for ; Fri, 25 Oct 2019 11:08:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=/dDefoMM36PIRowlZl2Nw9qTsavoFN0b32BVnZFbmdI=; b=TE1I8ODdeGw+jnNWUNRzlklwmv17c6qrzXQrVdbHJnOnzIpNP0LmYLw3sMjAXxQAb9 CHWFQLhifF4aJbuSeqjIAHMuTV0SNZIzVTNtVMA2/nObkoSQcT58Aqhhb51ZeKfMaZZJ iqipyyZjhwmdUteNYMnEZdiB1kBhdMerdQGJAhOs+tnM8seYIWZah0MT65eZBsQPrlz7 wjsWgKm+bdrGyKT6sSCuUgcxroefjWKXAhhNGLBFlCLovRUfZRxpPjckVmvgQtEKr763 VwjMWrK3ShE1+09qVTaNr2GMbY8/lQMjhruFBaU1xF0QJ/ywB6QauIkj48oAvU5y81jk s51Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=/dDefoMM36PIRowlZl2Nw9qTsavoFN0b32BVnZFbmdI=; b=TEdln0ZzK8AeVkFtIgG1OlH4GwsX+FhL2S/5IUFRrKwgCL1yAU9wdAwTe5FOhbu0pi OP7I0vyDVqd2vVUSlzTr0NbvinMKjWDqCDGRbsdiwu4x1+un61Nuc+jbQJQ/U35F/I3S YwkLoq6oenTZG3okzR4yz+r5a7Mnin0Har4bJRQfY1Qm5b3zBrq1zwZjkRI38keA1+Ct NRPyVqs5EjoCRJolr4bR3hmTrRNJ9Yms3QPoy6ctcwKqV9B0AR6/i/Wt56FEVJ2JoV+f JCWan1eu2oDAdW0GyVnMovX6Vx/w0CNQWMtvRJqlVnYZ7kVn9Q3GWbE+8aXXjbrc2rDb LvFA== X-Gm-Message-State: APjAAAXgOf+zHvEc6PYQ74o7Ho6xuZx57xNA+Dtrwe501K0RSeZ3qMZz J684D83n6we1wimQLFC1ZTspSV1Fswr1 X-Google-Smtp-Source: APXvYqzIYA9d/vGzxB2esIdYemJ0Oq68o8ieY6t+zqP7n9k/G/llUi72E8BavQN495zkdxVZgQ7xf0PS/Bxl X-Received: by 2002:a63:5d18:: with SMTP id r24mr1468551pgb.53.1572026936817; Fri, 25 Oct 2019 11:08:56 -0700 (PDT) Date: Fri, 25 Oct 2019 11:08:26 -0700 In-Reply-To: <20191025180827.191916-1-irogers@google.com> Message-Id: <20191025180827.191916-9-irogers@google.com> Mime-Version: 1.0 References: <20191024190202.109403-1-irogers@google.com> <20191025180827.191916-1-irogers@google.com> X-Mailer: git-send-email 2.24.0.rc0.303.g954a862665-goog Subject: [PATCH v4 8/9] perf tools: if pmu configuration fails free terms From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andi Kleen , Jin Yao , Adrian Hunter , Kan Liang , John Garry , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, clang-built-linux@googlegroups.com Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Avoid a memory leak when the configuration fails. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index fb6436a74869..3db1b647db38 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1390,8 +1390,15 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, if (get_config_terms(head_config, &config_terms)) return -ENOMEM; - if (perf_pmu__config(pmu, &attr, head_config, parse_state->error)) + if (perf_pmu__config(pmu, &attr, head_config, parse_state->error)) { + struct perf_evsel_config_term *pos, *tmp; + + list_for_each_entry_safe(pos, tmp, &config_terms, list) { + list_del_init(&pos->list); + free(pos); + } return -EINVAL; + } evsel = __add_event(list, &parse_state->idx, &attr, get_config_name(head_config), pmu, -- 2.24.0.rc0.303.g954a862665-goog