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 2/3] RAS: Fix out-of-bounds read when tracing arm_event
Date: Wed, 9 Sep 2026 19:28:31 +0800 [thread overview]
Message-ID: <20260909112832.805314-3-liuwenliang@huawei.com> (raw)
In-Reply-To: <20260909112832.805314-1-liuwenliang@huawei.com>
The vsei_len < 0 error path did not verify the pei_len and ctx_len.
When vsei_len is negative, section_length is too small to hold the
full record, yet pei_len and ctx_len were derived from
err_info_num/context_info_num and may describe regions beyond the
(long)err .. err + section_length buffer. To prevent trace_arm_event
from reading past the allocated record, sanitize the parameters:
recalculate ctx_len and pei_len based on section_length, limit them,
and set the corresponding pointers to NULL and lengths to 0 when
there is no remaining space.
pei_len and ctx_len become s32 so that the recalculated lengths can
be checked for negative values.
Fixes: 05954511b73e ("RAS: Report all ARM processor CPER information to userspace")
Signed-off-by: Abbott Liu <liuwenliang@huawei.com>
---
drivers/ras/ras.c | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
index 2540538a16a8..085fe2d980e5 100644
--- a/drivers/ras/ras.c
+++ b/drivers/ras/ras.c
@@ -58,10 +58,10 @@ void log_arm_hw_error(struct cper_sec_proc_arm *err, const u8 sev)
struct cper_arm_err_info *err_info;
struct cper_arm_ctx_info *ctx_info;
u8 *ven_err_data;
- u32 ctx_len = 0;
+ s32 ctx_len = 0;
int n, sz, cpu;
s32 vsei_len;
- u32 pei_len;
+ s32 pei_len;
u8 *pei_err, *ctx_err;
pei_len = sizeof(struct cper_arm_err_info) * err->err_info_num;
@@ -87,14 +87,28 @@ void log_arm_hw_error(struct cper_sec_proc_arm *err, const u8 sev)
pr_warn(FW_BUG "section length is too small\n");
pr_warn(FW_BUG "firmware-generated error record is incorrect\n");
vsei_len = 0;
+ ven_err_data = NULL;
+
+ ctx_len = err->section_length - (sizeof(struct cper_sec_proc_arm) + pei_len);
+ if (ctx_len < 0) {
+ ctx_len = 0;
+ ctx_err = NULL;
+
+ pei_len = err->section_length - sizeof(struct cper_sec_proc_arm);
+ if (pei_len < 0) {
+ pei_len = 0;
+ pei_err = NULL;
+ }
+ }
+ } else {
+ ven_err_data = (u8 *)ctx_info;
}
- ven_err_data = (u8 *)ctx_info;
cpu = GET_LOGICAL_INDEX(err->mpidr);
if (cpu < 0)
cpu = -1;
- trace_arm_event(err, pei_err, pei_len, ctx_err, ctx_len,
+ trace_arm_event(err, pei_err, (u32)pei_len, ctx_err, (u32)ctx_len,
ven_err_data, (u32)vsei_len, sev, cpu);
}
--
2.43.0
next prev parent reply other threads:[~2026-09-09 11:28 UTC|newest]
Thread overview: 7+ 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 ` Abbott Liu [this message]
2026-09-17 2:14 ` [PATCH v4 2/3] RAS: Fix out-of-bounds read when tracing arm_event Hanjun Guo
2026-09-09 11:28 ` [PATCH v4 3/3] RAS: Fix integer overflow in ARM processor error context walk Abbott Liu
2026-09-21 1:27 [PATCH v4 2/3] RAS: Fix out-of-bounds read when tracing arm_event Liuwenliang (Abbott Liu)
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-3-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®