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 E2FE4C5DF60 for ; Thu, 7 Nov 2019 22:15:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B526621882 for ; Thu, 7 Nov 2019 22:15:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="mKKIHHcP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727665AbfKGWOy (ORCPT ); Thu, 7 Nov 2019 17:14:54 -0500 Received: from mail-pg1-f202.google.com ([209.85.215.202]:39318 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727715AbfKGWOx (ORCPT ); Thu, 7 Nov 2019 17:14:53 -0500 Received: by mail-pg1-f202.google.com with SMTP id 21so2993345pgt.6 for ; Thu, 07 Nov 2019 14:14:53 -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=o8eDtK4XLT1yB0wxfi9aIxQpXeS3/ycmioxd58yIuN4=; b=mKKIHHcPsVgAONMoZXSGtLwt9SP+tD9wXU5Rr4ErMd4qk25xxGHIDhu0/Qj6blDSXu vw8yk435k0zSoO7r85MUWnIiDGrJKFGdKDK82Jw7m6NySbCo1Vauj2i4miFVTQu63CO2 lA2NNfwcoNrNMgMCR2EJDl6GnmqjppeRJr8OGLkbz4E3cUhsSmX7F6VsUKv6g416lBld ejPPz9FG0oGRPSlxptOA762PUJY1ysICvSgHASLoYEhjd4BKZ04jbyyLmhEgBxGvpZsR VTQmYTQpApuWnvWKLmyzGmGQ6t5rq1PWRG9ioiWslfV5INFn/whzTGswzoaPdX9PRlzp 1VWA== 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=o8eDtK4XLT1yB0wxfi9aIxQpXeS3/ycmioxd58yIuN4=; b=jKG66SUDPxUOG70rj/T1T/bPgbB8ovr9KbmiLQMUB/9xBQXHkSCE8NYQMpvcstfSEx cbYVbC+YxVzGnbS9OdcLe6RYe0FWfnV4DoaD0T9tRzP9d1EhKqqzDCkfMR9jpYKt6Cw5 svHdu+C+iooPNyL+byfNO6sHXM91RzilH2ESAc0uHG75QfFEg4auGHrsMo8w4Xyub0j/ Tiev+3JZx7UApFkm4a+QoWz/I/VEDAIFy8l86TyEQV7YU5SvwrE4PLFcANzu9Z8eNEWD rwubHdcfPXjwh+sDecyX5wIVZYTLIQV8dHC6N5S34KZf4PWqIMLbTTx7L+p/pEig3X8B cnyw== X-Gm-Message-State: APjAAAWu6AwxhKAnWPyQUENQdVw+6cWwD1d8uh5JMOOu+iNj4saQqxzW TmHh1jBRzqQto6O3+T8YCKriyR2ZD5mo X-Google-Smtp-Source: APXvYqwJ8VuG9hRWejetPkhG8pMOZtZDUOZmAuU7dpgY1u7aUXH4GS+ccoeO9Va6IB9QTmImhuarKgMRCuzR X-Received: by 2002:a63:2b84:: with SMTP id r126mr7381052pgr.77.1573164892310; Thu, 07 Nov 2019 14:14:52 -0800 (PST) Date: Thu, 7 Nov 2019 14:14:22 -0800 In-Reply-To: <20191107221428.168286-1-irogers@google.com> Message-Id: <20191107221428.168286-5-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 04/10] perf tools: splice events onto evlist even on error 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 If event parsing fails the event list is leaked, instead splice the list onto the out result and let the caller cleanup. An example input for parse_events found by libFuzzer that reproduces this memory leak is 'm{'. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index e9b958d6c534..03e54a2d8685 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1950,15 +1950,20 @@ int parse_events(struct evlist *evlist, const char *str, ret = parse_events__scanner(str, &parse_state, PE_START_EVENTS); perf_pmu__parse_cleanup(); + + if (!ret && list_empty(&parse_state.list)) { + WARN_ONCE(true, "WARNING: event parser found nothing\n"); + return -1; + } + + /* + * Add list to the evlist even with errors to allow callers to clean up. + */ + perf_evlist__splice_list_tail(evlist, &parse_state.list); + if (!ret) { struct evsel *last; - if (list_empty(&parse_state.list)) { - WARN_ONCE(true, "WARNING: event parser found nothing\n"); - return -1; - } - - perf_evlist__splice_list_tail(evlist, &parse_state.list); evlist->nr_groups += parse_state.nr_groups; last = evlist__last(evlist); last->cmdline_group_boundary = true; -- 2.24.0.432.g9d3f5f5b63-goog