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 2E3792F6932; Fri, 17 Oct 2025 15:06:28 +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=1760713588; cv=none; b=X6iBDYBtyQPf8qdpZSSqmfSCrdAhTQqIsNVPlJ/xB52gwlsM7+QuUlD8d5DGLi36WqAsLkxQfs8dNESU8eCTM57EitiV9xRcGEAHOhDO0CBu/ZyputNXbQnyZ3qZHtOFE1KnS6cYsgmYaoQAfXjB3aAed5t+1GAQq9p75O6AwPw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760713588; c=relaxed/simple; bh=yOcRPVkiB3/yI90LJMBQWDMsDglZlUlwZhzMWfC6yAs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sXG+9Rry19ihe93z66SBG+esxbgFEzn7OC9G0PVHlsSdkZZwRcYMT/6jf21OWZSkruK8avsaO+UOneijH9tmggGQtcIN6eTXcXHc/zCw4ZSC64xsYLFnKnMZnoX1oA1ZeX+qzIyHxcjYtZFBT9bHuBFbwxRrtmG+d1k3Kxw/CBE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OzTM2gnH; 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="OzTM2gnH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80A54C4CEE7; Fri, 17 Oct 2025 15:06:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760713588; bh=yOcRPVkiB3/yI90LJMBQWDMsDglZlUlwZhzMWfC6yAs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OzTM2gnHY2fzgJfhtRISrf78NPUmOWtDnbDBPabHbFl/IzE7gTi/D2b6FxiiI8u98 qHGyVQcSNWaIE2suBYEZgl/Y3dLGCdCbMsfYL3GCcqQV00tC+HKitu/tuqBaws4bx9 TauDw9IxXLZmmY/qAAxCkxLGYIgkv96vXtfv/Qqw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, James Clark , Ian Rogers , Namhyung Kim , Adrian Hunter , Alexander Shishkin , Athira Rajeev , Blake Jones , Chun-Tse Shao , Collin Funk , Howard Chu , Ingo Molnar , Jan Polensky , Jiri Olsa , Kan Liang , Li Huafei , Mark Rutland , Nam Cao , Peter Zijlstra , "Steinar H. Gunderson" , Thomas Gleixner , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 6.6 007/201] perf evsel: Avoid container_of on a NULL leader Date: Fri, 17 Oct 2025 16:51:08 +0200 Message-ID: <20251017145134.997286167@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251017145134.710337454@linuxfoundation.org> References: <20251017145134.710337454@linuxfoundation.org> User-Agent: quilt/0.69 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit 2354479026d726954ff86ce82f4b649637319661 ] An evsel should typically have a leader of itself, however, in tests like 'Sample parsing' a NULL leader may occur and the container_of will return a corrupt pointer. Avoid this with an explicit NULL test. Fixes: fba7c86601e2e42d ("libperf: Move 'leader' from tools/perf to perf_evsel::leader") Reviewed-by: James Clark Signed-off-by: Ian Rogers Acked-by: Namhyung Kim Cc: Adrian Hunter Cc: Alexander Shishkin Cc: Athira Rajeev Cc: Blake Jones Cc: Chun-Tse Shao Cc: Collin Funk Cc: Howard Chu Cc: Ingo Molnar Cc: Jan Polensky Cc: Jiri Olsa Cc: Kan Liang Cc: Li Huafei Cc: Mark Rutland Cc: Nam Cao Cc: Peter Zijlstra Cc: Steinar H. Gunderson Cc: Thomas Gleixner Link: https://lore.kernel.org/r/20250821163820.1132977-4-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/util/evsel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 2a6295f1ac1bc..cdd13f576c191 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -3131,6 +3131,8 @@ bool evsel__is_hybrid(const struct evsel *evsel) struct evsel *evsel__leader(const struct evsel *evsel) { + if (evsel->core.leader == NULL) + return NULL; return container_of(evsel->core.leader, struct evsel, core); } -- 2.51.0