From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 06CA43290AA; Mon, 15 Jun 2026 22:33:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781562795; cv=none; b=HmzzIjEvgQTe6u9P4J9Z4WhT0HEYpbItgLiaDevlVTHpn6lGMQGtgfLVAJA/wg7EdLSiQD+NCNyhDQvLyWlRRz6eaO+PgC1qWPTYnyHGeMPiaAR/fkCSsP0BneUROR/iVk2t7ZBAyS/iH5pIMXzips6GmRxogXQiRwDXegGr0+U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781562795; c=relaxed/simple; bh=/ouZAdwPNodkqdYcbLkgddbPDqEhLnZ+uZcM97iV06I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U6hQ5c3uwLx7KsQtnakk6G6468q+vuZoJ+rplc+t81ZTkBMxFWwxeQp+cBaw5EAkqUp5jN6Y2I3SPcLKfVkW2mNHH6NvDwoM70GGMSTV/eEJY1Lap6vDtqiI8xRGuTV7FHsllZnP5vQmSNLPmQ+1613eohdZ7Fn0h7Dk8xAL35k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oPZztEmM; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oPZztEmM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0359B1F000E9; Mon, 15 Jun 2026 22:33:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781562793; bh=go+3OAOQAlKkBE7/7hRA2XivK9iT+vmvDtATOYjf8XQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oPZztEmMIrAwIGwVVEtT1u59OlyrTmMvZJ3FwKbFH9O74GmwIyf2rU0ePsLU+tOB/ W8zf4GA4nn8fiH3BMBav6tGKquKeWVEsY7s3MnrtzcEDAfEiRNy9ejWGe0EiBf3Mon SWA2cxGl1l0jjzGEz97ZnTnjFq+ugXmKpJpLNwH3llN+Z62o2UOpNuwtvEWb5rtpq4 ZszFKod7g5zwwvGw7A0/a0Jo0SWh9pAcq79zmi2pFOqlAqG5sDZ1EFHQca4dnsoJkF DRoKTvBXPwWizyxwbtKcXek5LciyTKRlod5f5yuGEFHu84z9opmLOU2VXZNMqKIyfm jcGfAib6yloiA== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , sashiko-bot , James Clark , Leo Yan , Claude Subject: [PATCH 4/9] perf cs-etm: Require full global header in auxtrace_info size check Date: Mon, 15 Jun 2026 19:32:44 -0300 Message-ID: <20260615223249.36598-5-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260615223249.36598-1-acme@kernel.org> References: <20260615223249.36598-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnaldo Carvalho de Melo cs_etm__process_auxtrace_info() checks that header.size covers event_header_size + INFO_HEADER_SIZE (16 bytes total), but then accesses ptr[CS_PMU_TYPE_CPUS] at offset 24 from the start of the event. A crafted 16-byte auxtrace_info event passes the size check but reads out-of-bounds. Include CS_ETM_HEADER_SIZE in the minimum size check so that the global header entries (version, pmu_type_cpus, snapshot) are guaranteed to fit within the event. Fixes: 55c1de9973d66516 ("perf cs-etm: Print auxtrace info even if OpenCSD isn't linked") Reported-by: sashiko-bot Cc: Adrian Hunter Cc: James Clark Cc: Leo Yan Assisted-by: Claude Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/cs-etm-base.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/cs-etm-base.c b/tools/perf/util/cs-etm-base.c index 4abe416e3febd2cc..aebef71d3a0a1d7b 100644 --- a/tools/perf/util/cs-etm-base.c +++ b/tools/perf/util/cs-etm-base.c @@ -170,7 +170,9 @@ int cs_etm__process_auxtrace_info(union perf_event *event, u64 *ptr = NULL; u64 hdr_version; - if (auxtrace_info->header.size < (event_header_size + INFO_HEADER_SIZE)) + /* Ensure priv[] is large enough for the global header entries */ + if (auxtrace_info->header.size < (event_header_size + INFO_HEADER_SIZE + + CS_ETM_HEADER_SIZE)) return -EINVAL; /* First the global part */ -- 2.54.0