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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 9566EC43331 for ; Thu, 7 Nov 2019 19:05:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C219218AE for ; Thu, 7 Nov 2019 19:05:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573153525; bh=9Uj1Td2gQRLWqpoRXt/3lPpJOKmuBur3ZIO0ExPDuvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OpJHzy29slaFUOCK0j/P3SOOLj58pT3JjnkHwlLd3L3QkPU1wdCdkQXpqtVSma4bt IPtDMW+wWyV9aF5uQdbL9MQKTRaK0oi0i1DFATJ08wZnPvPizJhBeCJmfGEl2IRUoT +Ck8Rq9pqQX4kAhc8g27ueVdJTbYsF4K/qLRxYSo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730456AbfKGTFY (ORCPT ); Thu, 7 Nov 2019 14:05:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:43876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726061AbfKGTFX (ORCPT ); Thu, 7 Nov 2019 14:05:23 -0500 Received: from quaco.ghostprotocols.net (179-240-172-58.3g.claro.net.br [179.240.172.58]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 494F421882; Thu, 7 Nov 2019 19:05:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573153522; bh=9Uj1Td2gQRLWqpoRXt/3lPpJOKmuBur3ZIO0ExPDuvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HKt6/puHcEd7GsGCxS97HfpQ0nm9tBJEItR30eyZKPxn7EjDh44geei0zrI/NbXgR kPCJpTwgeDa6AZ3TZChFX+N3NXc7fBjnMITEy0eDYtQXg1KzTgJPjGolEPElrYwm8M HOYVWa1N/8ZMNo/wm10ObDyiyey9YCC1UDzBYOhE= From: Arnaldo Carvalho de Melo To: Ingo Molnar , Thomas Gleixner Cc: Jiri Olsa , Namhyung Kim , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Ian Rogers , Adrian Hunter , Alexander Shishkin , Alexei Starovoitov , Andi Kleen , Daniel Borkmann , Jin Yao , John Garry , Kan Liang , Mark Rutland , Martin KaFai Lau , Peter Zijlstra , Song Liu , Stephane Eranian , Yonghong Song , bpf@vger.kernel.org, clang-built-linux@googlegroups.com, netdev@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 34/63] perf tools: Splice events onto evlist even on error Date: Thu, 7 Nov 2019 15:59:42 -0300 Message-Id: <20191107190011.23924-35-acme@kernel.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191107190011.23924-1-acme@kernel.org> References: <20191107190011.23924-1-acme@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ian Rogers 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 Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Alexei Starovoitov Cc: Andi Kleen Cc: Daniel Borkmann Cc: Jin Yao Cc: John Garry Cc: Kan Liang Cc: Mark Rutland Cc: Martin KaFai Lau Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Song Liu Cc: Stephane Eranian Cc: Yonghong Song Cc: bpf@vger.kernel.org Cc: clang-built-linux@googlegroups.com Cc: netdev@vger.kernel.org Link: http://lore.kernel.org/lkml/20191025180827.191916-5-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo --- 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 db882f630f7e..d36b8129b27a 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1927,15 +1927,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.21.0