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 4A86130DED1; Mon, 15 Jun 2026 21:37:21 +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=1781559442; cv=none; b=DjoWtf2aI6aS1OCoFYOdCgQlj8demSb+NmYHCJGZh4CmyMo7yCDO8lnRFuNUSl9i6HM9ZGZXXiEtYLimOMOOHZIqE3GV/ZHW+29dYIMIswTFghPbHz++J+YhFgVVke5eOLWB2JcPRE56IW5sC1NcQoHRtfqmj6We3MvXzQAUqGU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781559442; c=relaxed/simple; bh=/ouZAdwPNodkqdYcbLkgddbPDqEhLnZ+uZcM97iV06I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YwjcQMpCVw52SBa6xdjxkIvkY+FGyBvMRuqEkbyJiGDEQEtXlSDLedxHGXCSoF3W5NP1RlUb//zlu1lDp1YufgUxhqI8UBpFsJtCcV8vcrrxvuNaq3BBHuFrNGbx1snZujjQAPV0HG0n3d46PgAUC3KnP0sIQ1/nLtq/fh2+hNM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c+uBOz7O; 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="c+uBOz7O" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 42A721F000E9; Mon, 15 Jun 2026 21:37:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781559440; bh=go+3OAOQAlKkBE7/7hRA2XivK9iT+vmvDtATOYjf8XQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=c+uBOz7OVxuR86EaVMGgbENcXTzCpjDzV31vwXkn14KucQg7361AWqArj2rDsfkxs 6eqsaAYO7MvXbxxmybt9pu+SbVR/Iz5y+PIk4pCeyTGs6WzkdjgKPs5lVNzsuTxPzQ EA1vohhHdExI/e2zu3OVj/VPCtF98454t3vnzfndXAMiG1QDoChkn9ckZWBfQnAhjb wCJWFqrXleQPYptjI7tOSlX2s2F4i8GlitZCLOYmOmnTG8C8BDasQ1fiK59KAFIZR8 BglhcOt1a8znHSMhxb7TcNVPYImam+W/5p3g0BVrZ3/TcS+qvJ+gjmEyeFlpQVGE4Y iTnG4yYVsDLDA== 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 18:36:52 -0300 Message-ID: <20260615213657.35776-5-acme@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260615213657.35776-1-acme@kernel.org> References: <20260615213657.35776-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@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