From: Abbott Liu <liuwenliang@huawei.com>
To: <tony.luck@intel.com>, <bp@alien8.de>, <ardb@kernel.org>,
<mchehab+huawei@kernel.org>, <rafael.j.wysocki@intel.com>,
<guohanjun@huawei.com>, <jic23@kernel.org>,
<jason@os.amperecomputing.com>, <danielf@os.amperecomputing.com>,
<luoshengwei@huawei.com>, <linux-edac@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Cc: <yangzhuohao1@huawei.com>, <douzhaolei@huawei.com>,
<zouyipeng@huawei.com>, <wangbing6@huawei.com>,
<nixiaoming@huawei.com>, <liuwenliang@huawei.com>
Subject: [PATCH v4 3/3] RAS: Fix integer overflow in ARM processor error context walk
Date: Wed, 9 Sep 2026 19:28:32 +0800 [thread overview]
Message-ID: <20260909112832.805314-4-liuwenliang@huawei.com> (raw)
In-Reply-To: <20260909112832.805314-1-liuwenliang@huawei.com>
sz is an int while ctx_info->size is a u32, so a size greater than
0x7fffffff makes sz negative and moves ctx_info below the error
record. The header check of the next iteration then passes, because
the offset of ctx_info relative to err is negative, and ctx_info->size
is read from a wild pointer. A negative sz also deflates ctx_len,
which can keep vsei_len non-negative, so the truncated record path is
not taken and the out-of-section ctx_info is traced as vendor error
data.
Check each context entry with 64-bit arithmetic: both the header and
the context data must fit within err + section_length. Stop the walk
at the first entry that does not fit, flag the record as overflowed
and take the truncated record path, which sanitizes the values
passed to trace_arm_event(), instead of detecting the overflow after
the walk only from a negative vsei_len.
Fixes: 87880af2d24e ("APEI/GHES: ARM processor Error: don't go past allocated memory")
Fixes: 05954511b73e ("RAS: Report all ARM processor CPER information to userspace")
Reported-by: Hanjun Guo <guohanjun@huawei.com>
Link: https://lore.kernel.org/all/20260825134323.4181892-1-liuwenliang@huawei.com/
Signed-off-by: Abbott Liu <liuwenliang@huawei.com>
---
drivers/ras/ras.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index 085fe2d980e5..db378fd6f1ff 100644
--- a/drivers/ras/ras.c
+++ b/drivers/ras/ras.c
@@ -59,6 +59,7 @@ void log_arm_hw_error(struct cper_sec_proc_arm *err, const u8 sev)
struct cper_arm_ctx_info *ctx_info;
u8 *ven_err_data;
s32 ctx_len = 0;
+ bool overflow = false;
int n, sz, cpu;
s32 vsei_len;
s32 pei_len;
@@ -74,15 +75,21 @@ void log_arm_hw_error(struct cper_sec_proc_arm *err, const u8 sev)
for (n = 0; n < err->context_info_num; n++) {
sz = sizeof(struct cper_arm_ctx_info);
- if (sz + (long)ctx_info - (long)err <= err->section_length)
+ if ((sz + (long)ctx_info - (long)err <= err->section_length) &&
+ ((u64)sz + ctx_info->size + ((long)ctx_info - (long)err) <=
+ err->section_length)) {
sz += ctx_info->size;
+ } else {
+ overflow = true;
+ break;
+ }
ctx_info = (struct cper_arm_ctx_info *)((long)ctx_info + sz);
ctx_len += sz;
}
vsei_len = err->section_length - (sizeof(struct cper_sec_proc_arm) + pei_len + ctx_len);
- if (vsei_len < 0) {
+ if (overflow || vsei_len < 0) {
pr_warn(FW_BUG "section length: %d\n", err->section_length);
pr_warn(FW_BUG "section length is too small\n");
pr_warn(FW_BUG "firmware-generated error record is incorrect\n");
--
2.43.0
prev parent reply other threads:[~2026-09-09 11:29 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-09 11:28 [PATCH v4 0/3] RAS: Fix ARM processor error bounds checking Abbott Liu
2026-09-09 11:28 ` [PATCH v4 1/3] RAS: Fix inverted context info bounds check in ARM processor errors Abbott Liu
2026-09-17 2:13 ` Hanjun Guo
2026-09-09 11:28 ` [PATCH v4 2/3] RAS: Fix out-of-bounds read when tracing arm_event Abbott Liu
2026-09-17 2:14 ` Hanjun Guo
2026-09-09 11:28 ` Abbott Liu [this message]
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=20260909112832.805314-4-liuwenliang@huawei.com \
--to=liuwenliang@huawei.com \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=danielf@os.amperecomputing.com \
--cc=douzhaolei@huawei.com \
--cc=guohanjun@huawei.com \
--cc=jason@os.amperecomputing.com \
--cc=jic23@kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luoshengwei@huawei.com \
--cc=mchehab+huawei@kernel.org \
--cc=nixiaoming@huawei.com \
--cc=rafael.j.wysocki@intel.com \
--cc=tony.luck@intel.com \
--cc=wangbing6@huawei.com \
--cc=yangzhuohao1@huawei.com \
--cc=zouyipeng@huawei.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®