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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06EE3C433EF for ; Tue, 12 Jul 2022 11:28:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232356AbiGLL2s (ORCPT ); Tue, 12 Jul 2022 07:28:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232118AbiGLL2m (ORCPT ); Tue, 12 Jul 2022 07:28:42 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8891632A for ; Tue, 12 Jul 2022 04:28:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657625320; x=1689161320; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=onTgph3rXetM5BAUTtdZP1dl7HRIsTscsKh4CTi0arU=; b=gXIIyl/CWBXT6PJE9aoQCamiVjn+0bf79PNZmEIAPuvtlCWREdZqE5Ot gVBvzI7yQ4LcqubYG6MxRbmVwT6pctrjEMn6r5vVA4OgZ3m5yjtbl0+1U f2pCT/+6Qe9GTPO6IirO1k3bEh2vyp6vDoMksa7fBeRMGkMpq+DOWdaNv 6BYbCzkgQoSOMFM8glbWzV8RjUadVXwrE2Qk8SKxncbV71k24UYHsiwIh do9iYjBB6Hh2LLUO5SZf9+ys55Ap+Kavzm4tOLytlX9vR7X+1cOLlA/x9 PXv53cRzryzU927x+C+7/nMTbp0ey6DaqNwz/WOPVlnEBMyIqTnZVTsfR Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10405"; a="310523781" X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="310523781" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 04:28:40 -0700 X-IronPort-AV: E=Sophos;i="5.92,265,1650956400"; d="scan'208";a="652870324" Received: from ahunter6-mobl1.ger.corp.intel.com (HELO ahunter-VirtualBox.home\044ger.corp.intel.com) ([10.252.51.155]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jul 2022 04:28:38 -0700 From: Adrian Hunter To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Namhyung Kim , Ian Rogers , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] perf parse-events: Fix segfault when event parser gets an error Date: Tue, 12 Jul 2022 14:28:23 +0300 Message-Id: <20220712112824.28770-2-adrian.hunter@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220712112824.28770-1-adrian.hunter@intel.com> References: <20220712112824.28770-1-adrian.hunter@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org parse_events() is often called with parse_events_error set to NULL. Make parse_events_error__handle() not segfault in that case. Fixes: 43eb05d06679 ("perf tests: Support 'Track with sched_switch' test for hybrid") Signed-off-by: Adrian Hunter --- tools/perf/util/parse-events.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 7ed235740431..700c95eafd62 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -2391,9 +2391,12 @@ void parse_events_error__exit(struct parse_events_error *err) void parse_events_error__handle(struct parse_events_error *err, int idx, char *str, char *help) { - if (WARN(!str, "WARNING: failed to provide error string\n")) { - free(help); - return; + if (WARN(!str, "WARNING: failed to provide error string\n")) + goto out_free; + if (!err) { + /* Assume caller does not want message printed */ + pr_debug("event syntax error: %s\n", str); + goto out_free; } switch (err->num_errors) { case 0: @@ -2419,6 +2422,11 @@ void parse_events_error__handle(struct parse_events_error *err, int idx, break; } err->num_errors++; + return; + +out_free: + free(str); + free(help); } #define MAX_WIDTH 1000 -- 2.25.1