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 9D96519644F; Thu, 6 Jun 2024 14:09:29 +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=1717682969; cv=none; b=OrmHg71epcmM3tkbpIhbmqroJBLRqyhVsZJW71LeAzh2W/BTF9kx7hsEvUwNgwuw9ykIze/XvEqYOOIeyh1h9TniqDjSSvKoRn/qSrKsu5yHpLZYGup51ur4FyIFXI1V4A99XwjBRdq94Fcwoh2gBX4dKtn2CexkRcIIGAcQ1do= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682969; c=relaxed/simple; bh=AAlBxdnHyXdF+/BOVD1jKq/8x6dnkFCTWKFocOPLh/4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=faStHdcC9lUjpo97LVmezcaUFSPg80Dnju1Mys/bGJfp0EsZ0vt84dO8n+Yt4/yx/amUc25wTGKriSpHzheDf8GL3rbTCBuRjGyEV5JLU8/5Hm1rSLcfYoZ+nUwlHblD8iP5xEQcRY9o1SxboS6kV4HBO5VgmjS7fI4c+/NGk6E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WyRkGV0X; 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="WyRkGV0X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76AA5C2BD10; Thu, 6 Jun 2024 14:09:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717682969; bh=AAlBxdnHyXdF+/BOVD1jKq/8x6dnkFCTWKFocOPLh/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WyRkGV0XIxpjKTlyGRZa7gRTgDqUxEFDYWHLbctuKhdlDKbySqFLh8vDHRQYCvuH2 bw9XzWWr2GqzTq9UCNDwIUZG45lsjUBMARCbc5FA9FKm2l/Wa3WsSiWX9evZkuLB9O lZREvd39vI70jWDu2knolvgh5pvINgiukMvMihy0= 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.9 100/374] perf report: Avoid SEGV in report__setup_sample_type() Date: Thu, 6 Jun 2024 16:01:19 +0200 Message-ID: <20240606131655.263233680@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131651.683718371@linuxfoundation.org> References: <20240606131651.683718371@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-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 dcd93ee5fc24e..5b684d2ab4be5 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -428,7 +428,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