From: Dave Jiang <dave.jiang@intel.com>
To: linux-cxl@vger.kernel.org, linux-perf-users@vger.kernel.org
Cc: jic23@kernel.org, will@kernel.org, mark.rutland@arm.com,
dave@stgolabs.net, sashiko-bot@kernel.org
Subject: [PATCH v2 7/9] perf/cxl: Validate the hardware-reported counter width
Date: Wed, 29 Jul 2026 07:55:53 -0700 [thread overview]
Message-ID: <20260729145555.3919550-8-dave.jiang@intel.com> (raw)
In-Reply-To: <20260729145555.3919550-1-dave.jiang@intel.com>
cxl_pmu_parse_caps() takes the Counter Width straight from the CPMU
Capability register with no bounds check. The Counter Data register is
64 bits, so a device reporting width 0 (or > 64) is invalid, and the
read path's GENMASK_ULL(counter_width - 1, 0) would shift out of range
(undefined behavior, e.g. a UBSAN splat) on a value of 0.
Reject a counter width outside 1..64 at probe.
Fixes: 5d7107c72796 ("perf: CXL Performance Monitoring Unit driver")
Reported-by: sashiko-bot@kernel.org
Closes: https://sashiko.dev/#/patchset/20260715191454.459673-1-dave@stgolabs.net?part=1
Assisted-by: Claude:claude-opus-4-8
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
---
drivers/perf/cxl_pmu.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/drivers/perf/cxl_pmu.c b/drivers/perf/cxl_pmu.c
index 52e78a6e0960..2e817a52ff1e 100644
--- a/drivers/perf/cxl_pmu.c
+++ b/drivers/perf/cxl_pmu.c
@@ -139,6 +139,15 @@ static int cxl_pmu_parse_caps(struct device *dev, struct cxl_pmu_info *info)
info->num_counters = FIELD_GET(CXL_PMU_CAP_NUM_COUNTERS_MSK, val) + 1;
info->counter_width = FIELD_GET(CXL_PMU_CAP_COUNTER_WIDTH_MSK, val);
+ /*
+ * The Counter Data register is 64 bits wide, so a Counter Width of 0 or
+ * >64 is invalid. Reject it rather than let GENMASK_ULL(width - 1, 0) in
+ * the read path shift out of range.
+ */
+ if (info->counter_width == 0 || info->counter_width > 64) {
+ dev_err(dev, "Invalid counter width %d\n", info->counter_width);
+ return -ENODEV;
+ }
info->num_event_capabilities = FIELD_GET(CXL_PMU_CAP_NUM_EVN_CAP_REG_SUP_MSK, val) + 1;
info->filter_hdm = FIELD_GET(CXL_PMU_CAP_FILTERS_SUP_MSK, val) & CXL_PMU_FILTER_HDM;
--
2.55.0
next prev parent reply other threads:[~2026-07-29 14:56 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-29 14:55 [PATCH v2 0/9] perf/cxlpmu: Misc sashiko raised issues fixes Dave Jiang
2026-07-29 14:55 ` [PATCH v2 1/9] perf/cxl: Program the requested event group on configurable counters Dave Jiang
2026-07-29 15:06 ` sashiko-bot
2026-07-29 22:29 ` Jonathan Cameron
2026-07-30 15:50 ` Dave Jiang
2026-07-29 14:55 ` [PATCH v2 2/9] perf/cxl: Clear stale event fields before reprogramming a counter Dave Jiang
2026-07-29 15:08 ` sashiko-bot
2026-07-29 22:25 ` Jonathan Cameron
2026-07-30 15:45 ` Dave Jiang
2026-07-29 14:55 ` [PATCH v2 3/9] perf/cxl: Fix the counter overflow delta fixup Dave Jiang
2026-07-29 15:13 ` sashiko-bot
2026-07-29 22:21 ` Jonathan Cameron
2026-07-30 16:56 ` Dave Jiang
2026-07-30 17:19 ` Dave Jiang
2026-07-30 19:00 ` Jonathan Cameron
2026-07-29 14:55 ` [PATCH v2 4/9] perf/cxl: Accept an overflow interrupt on MSI message number 0 Dave Jiang
2026-07-29 19:28 ` Jonathan Cameron
2026-07-29 19:59 ` Davidlohr Bueso
2026-07-30 12:18 ` Robin Murphy
2026-07-30 17:57 ` Dave Jiang
2026-07-30 18:57 ` Jonathan Cameron
2026-07-30 21:32 ` Dave Jiang
2026-07-29 14:55 ` [PATCH v2 5/9] perf/cxl: Keep the overflow interrupt pinned to the managed CPU Dave Jiang
2026-07-29 15:23 ` sashiko-bot
2026-07-29 19:25 ` Jonathan Cameron
2026-07-29 20:27 ` Davidlohr Bueso
2026-07-30 11:46 ` Robin Murphy
2026-07-30 18:55 ` Jonathan Cameron
2026-07-30 21:34 ` Dave Jiang
2026-07-30 22:19 ` Dave Jiang
2026-07-29 14:55 ` [PATCH v2 6/9] perf/cxl: Unfreeze counters after handling an overflow interrupt Dave Jiang
2026-07-29 19:24 ` Jonathan Cameron
2026-07-30 12:04 ` Robin Murphy
2026-07-30 18:53 ` Jonathan Cameron
2026-07-30 23:00 ` Dave Jiang
2026-07-29 14:55 ` Dave Jiang [this message]
2026-07-29 15:11 ` [PATCH v2 7/9] perf/cxl: Validate the hardware-reported counter width sashiko-bot
2026-07-29 19:21 ` Jonathan Cameron
2026-07-29 14:55 ` [PATCH v2 8/9] perf/cxl: Don't use pmu.dev in IRQ and hotplug callbacks after unregister Dave Jiang
2026-07-29 15:34 ` sashiko-bot
2026-07-29 19:17 ` Jonathan Cameron
2026-07-30 11:38 ` Robin Murphy
2026-07-30 18:51 ` Jonathan Cameron
2026-07-29 14:55 ` [PATCH v2 9/9] perf/cxl: Avoid cpumask_of(-1) when no CPU is assigned Dave Jiang
2026-07-29 15:19 ` sashiko-bot
2026-07-29 19:14 ` Jonathan Cameron
2026-07-30 9:36 ` Robin Murphy
2026-07-31 0:11 ` Dave Jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260729145555.3919550-8-dave.jiang@intel.com \
--to=dave.jiang@intel.com \
--cc=dave@stgolabs.net \
--cc=jic23@kernel.org \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=sashiko-bot@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox