From: Yili Zhang <zhangyili01@baidu.com>
To: <jic23@kernel.org>
Cc: <alison.schofield@intel.com>, <benjamin.cheatham@amd.com>,
<dave.jiang@intel.com>, <dave@stgolabs.net>, <djbw@kernel.org>,
<linux-cxl@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<shijujose2008@gmail.com>, <vishal.l.verma@intel.com>,
<zhangyili01@baidu.com>
Subject: [PATCH v4] cxl/edac: Fail ECS threshold read for reserved encodings
Date: Thu, 29 Oct 2026 21:10:13 +0800 [thread overview]
Message-ID: <20261029131013.85983-1-zhangyili01@baidu.com> (raw)
cxl_get_ecs_threshold() extracts a 3-bit index (0-7) from the
device-supplied Error Check Scrub (ECS) config word and uses it to
index ecs_supp_threshold[], which only has 6 elements. A device
reporting index 6 or 7 causes an out-of-bounds read of adjacent
.rodata, whose value is then returned to userspace via the EDAC
'threshold' sysfs attribute (small info leak and wrong reported
threshold).
The threshold count field also has reserved encodings 0-2, which
currently read as 0 from the sparse lookup table. That behavior is
not intentional; it is just an artifact of the array's implicit
zero-fill. The ABI documentation only lists 256, 1024 and 4096 as
supported values, and the write side (cxl_set_ecs_threshold())
rejects everything else, so a reserved encoding can only come from
the device reporting it. Rather than documenting 0 as well, make the
read fail for all reserved encodings and only ever report the
documented values.
None of these encodings can be written through the sysfs write path,
and no device is known to report them, so this is hardening against
a device returning values not covered by the spec rather than a fix
for known hardware.
Convert the cxl_get_ecs_*() helpers to return an int and write the
attribute value through an output parameter (u32 * to match the
macro), so that errors propagate through the shared
CXL_ECS_GET_ATTR() macro to the sysfs read.
Reviewed-by: Ben Cheatham <benjamin.cheatham@amd.com>
Signed-off-by: Yili Zhang <zhangyili01@baidu.com>
---
v4: Spell out Error Check Scrub (ECS) on first use (Ben Cheatham)
and drop the Suggested-by tag (Alison Schofield). The diff is
unchanged, so the Reviewed-by is carried over from v3.
v3: Per review feedback, drop the Fixes tag and reword the
description to make clear this is hardening against a device
reporting values not covered by the spec rather than a fix
(Jonathan Cameron).
v2: Per review feedback, fail the read with -EINVAL for all reserved
encodings instead of returning 0, converting the cxl_get_ecs_*()
getters to an int return with an output parameter so the error
reaches the sysfs read (Alison Schofield).
v1: https://lore.kernel.org/all/20260928073553.85669-1-zhangyili01@baidu.com/
v2: https://lore.kernel.org/all/20260930095627.32616-1-zhangyili01@baidu.com/
v3: https://lore.kernel.org/all/20261021152053.85322-1-zhangyili01@baidu.com/
drivers/cxl/core/edac.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/cxl/core/edac.c b/drivers/cxl/core/edac.c
index b321971fef58..fd6612dde7f1 100644
--- a/drivers/cxl/core/edac.c
+++ b/drivers/cxl/core/edac.c
@@ -624,21 +624,31 @@ static int cxl_mem_ecs_set_attrbs(struct device *dev,
0, NULL);
}
-static u8 cxl_get_ecs_log_entry_type(u8 log_cap, u16 config)
+static int cxl_get_ecs_log_entry_type(u8 log_cap, u16 config, u32 *val)
{
- return FIELD_GET(CXL_ECS_LOG_ENTRY_TYPE_MASK, log_cap);
+ *val = FIELD_GET(CXL_ECS_LOG_ENTRY_TYPE_MASK, log_cap);
+
+ return 0;
}
-static u16 cxl_get_ecs_threshold(u8 log_cap, u16 config)
+static int cxl_get_ecs_threshold(u8 log_cap, u16 config, u32 *val)
{
u8 index = FIELD_GET(CXL_ECS_THRESHOLD_COUNT_MASK, config);
- return ecs_supp_threshold[index];
+ if (index >= ARRAY_SIZE(ecs_supp_threshold) ||
+ !ecs_supp_threshold[index])
+ return -EINVAL;
+
+ *val = ecs_supp_threshold[index];
+
+ return 0;
}
-static u8 cxl_get_ecs_count_mode(u8 log_cap, u16 config)
+static int cxl_get_ecs_count_mode(u8 log_cap, u16 config, u32 *val)
{
- return FIELD_GET(CXL_ECS_COUNT_MODE_MASK, config);
+ *val = FIELD_GET(CXL_ECS_COUNT_MODE_MASK, config);
+
+ return 0;
}
#define CXL_ECS_GET_ATTR(attrb) \
@@ -655,9 +665,7 @@ static u8 cxl_get_ecs_count_mode(u8 log_cap, u16 config)
if (ret) \
return ret; \
\
- *val = cxl_get_ecs_##attrb(log_cap, config); \
- \
- return 0; \
+ return cxl_get_ecs_##attrb(log_cap, config, val); \
}
CXL_ECS_GET_ATTR(log_entry_type)
--
2.27.0
next reply other threads:[~2026-10-29 13:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-29 13:10 Yili Zhang [this message]
2026-11-18 2:03 ` Alison Schofield
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=20261029131013.85983-1-zhangyili01@baidu.com \
--to=zhangyili01@baidu.com \
--cc=alison.schofield@intel.com \
--cc=benjamin.cheatham@amd.com \
--cc=dave.jiang@intel.com \
--cc=dave@stgolabs.net \
--cc=djbw@kernel.org \
--cc=jic23@kernel.org \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shijujose2008@gmail.com \
--cc=vishal.l.verma@intel.com \
/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
all inboxes | Powered by JetHome®