From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C37F1BA882; Thu, 6 Jun 2024 14:18:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683481; cv=none; b=juE3UiovJmPK1fxIgPQrakVTNgYxT00wypmEJJbpa29jcp/Wex17/zhShgdfTKw39YJObw93nz/a7Fd8O9xIhwoNn2KO5aMGamkM5Zio0yzgjCgu98N57EHddd72oXysTp54rONL7dS1HBNmR2E+f7e9FwmQym0rbvvfOiLGfe8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683481; c=relaxed/simple; bh=paHM8VZjIdQbKQ7rZsnT8bjZs8PjVFHM936qz0N1CTQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KK7KtHTNd2/JBtSVV9C0Jpk2AeKDsMAYIj3+2/VLtU5FIOAh52/qUbAhnTwf0RYVtVVVbEhEB/pEjsfFLlE+u6EvBCf9Ny2fpmSPAJsLKfpME8I5ZYplYwpP8m66hj2j1QAB0Ildlkx3Zz5awX8D3+LYH9gbgOK65Xh2gEd9lyc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RClzUEvQ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="RClzUEvQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5775CC32786; Thu, 6 Jun 2024 14:18:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683481; bh=paHM8VZjIdQbKQ7rZsnT8bjZs8PjVFHM936qz0N1CTQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RClzUEvQaxIKL04hob3xoTMZM57scs+Oj7EttCvWjz7yItTvyvriGzOKhmK0frNnA v10YAa90LG2IcBPr1k60mLJqzcQva9Hr5I6a0/KueF1/WEOYgb1aihZ5kjVaRrfirF EWkE1pW04mvASkerwuMhahOxFFmJfXcdQmoiPQe8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , Adrian Hunter , Alexander Shishkin , Ingo Molnar , James Clark , Jiri Olsa , Kan Liang , Leo Yan , Mark Rutland , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.1 340/473] perf report: Avoid SEGV in report__setup_sample_type() Date: Thu, 6 Jun 2024 16:04:29 +0200 Message-ID: <20240606131711.144256706@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131659.786180261@linuxfoundation.org> References: <20240606131659.786180261@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit 45b4f402a6b782352c4bafcff682bfb01da9ca05 ] In some cases evsel->name is lazily initialized in evsel__name(). If not initialized passing NULL to strstr() leads to a SEGV. Fixes: ccb17caecfbd542f ("perf report: Set PERF_SAMPLE_DATA_SRC bit for Arm SPE event") Signed-off-by: Ian Rogers Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Ingo Molnar Cc: James Clark Cc: Jiri Olsa Cc: Kan Liang Cc: Leo Yan Cc: Mark Rutland Cc: Namhyung Kim Cc: Peter Zijlstra Link: https://lore.kernel.org/r/20240508035301.1554434-4-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/builtin-report.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index b6d77d3da64f6..155f119b3db5c 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -416,7 +416,7 @@ static int report__setup_sample_type(struct report *rep) * compatibility, set the bit if it's an old perf data file. */ evlist__for_each_entry(session->evlist, evsel) { - if (strstr(evsel->name, "arm_spe") && + if (strstr(evsel__name(evsel), "arm_spe") && !(sample_type & PERF_SAMPLE_DATA_SRC)) { evsel->core.attr.sample_type |= PERF_SAMPLE_DATA_SRC; sample_type |= PERF_SAMPLE_DATA_SRC; -- 2.43.0