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=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 738D5C43331 for ; Thu, 7 Nov 2019 22:15:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 445D32075C for ; Thu, 7 Nov 2019 22:15:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="jrQORgPz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728080AbfKGWPG (ORCPT ); Thu, 7 Nov 2019 17:15:06 -0500 Received: from mail-pl1-f201.google.com ([209.85.214.201]:39696 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728041AbfKGWPF (ORCPT ); Thu, 7 Nov 2019 17:15:05 -0500 Received: by mail-pl1-f201.google.com with SMTP id w11so2696596ply.6 for ; Thu, 07 Nov 2019 14:15:04 -0800 (PST) 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=AdCqemr3Cpf7H//3sUI2jx4nwjMA/tcTnOzbDM/nvC0=; b=jrQORgPzeZELMCAxvGhKK+LNKIHx0lR7EPWzROuGYaZ+8MQcE47ixHonnM93zYy6Bb nqX5lHMzBwuMZf0i1kUDabzHy8kdEY46PjxcAApEcS91vHsUB6MfoINBzDy2G4B5wHaR HoXGNztVqF4MNmFNLonRL2ICkbGLFEhkXxnmnsKhAZyejQg+RxxIiKY7wNzIIewoeyCq THAE+F2X5AyEIIUIWWoU8vmV7zRhdAMlzpBlaCPqBwkFWjmJdNttL/Tlsua/9W6NL0JO f51/JAkOljq+y3t/Fd5eL9Rf/ZbXtyvMoyjb0iBJ/vFzTQOG4qe1MRJAyPoRNrzWYIp5 rs2A== 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=AdCqemr3Cpf7H//3sUI2jx4nwjMA/tcTnOzbDM/nvC0=; b=aCmrWW52S1RysQYCjmMW/xhZtCsA8KRQP4jj0/u5gndWv2ixSvt/y0iNm7Xwf3CeFH hAW+/qwzesr5oJdGstFZso+BNAQL9GVBg+/jFgoqwXkLbP7bH9RWzXvaJWnBp7F4KQ+b 3lfo3GTMVLymf86G7Deo6oNrQDT2lpzguDfZWNwG4qc6ls73mSo4ZptOIKSgpL9U9Siw LxwK8mn1nywHyi/RcDrAG7X6cnX6vi/NZL7qvgdCOCOfCRCGjki+YpTdATmQ2tQk+M10 ITiCQDVKwXL9/FnRHqTlQ/QVvJ5HA0lLYH/bck3VAFOjgqzaQpdBbrW1riGMyXvDCFBS KN1A== X-Gm-Message-State: APjAAAU9/ZremOJKmKyGOIqFHbg36P+Qdt0fOMusmYRVL9QYMwb6knE7 qAm7djenWtRtbL0ZG9g6G4k1tNlJzHW7 X-Google-Smtp-Source: APXvYqz/rkI814x4MOw4cAa7e4QfcUS64HmMtxPkZptIuD8Y+rQW1uOQ0spijoWFfSm8En8eJae60a5ns/vv X-Received: by 2002:a63:5848:: with SMTP id i8mr7445484pgm.217.1573164903292; Thu, 07 Nov 2019 14:15:03 -0800 (PST) Date: Thu, 7 Nov 2019 14:14:26 -0800 In-Reply-To: <20191107221428.168286-1-irogers@google.com> Message-Id: <20191107221428.168286-9-irogers@google.com> Mime-Version: 1.0 References: <20191030223448.12930-1-irogers@google.com> <20191107221428.168286-1-irogers@google.com> X-Mailer: git-send-email 2.24.0.432.g9d3f5f5b63-goog Subject: [PATCH v6 08/10] 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: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@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 578288c94d2a..a0a80f4e7038 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1388,8 +1388,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.432.g9d3f5f5b63-goog