RAS: Fix out-of-range section_length in ARM processor error handling
Hi Hanjun, thanks for your review.
Quoted 24 lines
Hi Abbott,
Quoted 10 lines · Abbott Liu
Commit
87880af2d24e("APEI/GHES: ARM processor Error: don't go past allocated memory") added bounds checks for malformed ARM processor error records but contained several bugs:- In
log_arm_hw_error(), thectx_infobounds check is inverted. The conditionsz + (long)ctx_info - (long)err >= err->section_lengthaddsctx_info->sizewhen the context header is already past the end of the section instead of when it is within bounds. So change the comparison to <=.Quoted 10 lines
- The
vsei_len< 0 error path did not verify thepei_lenandctx_len. Whenvsei_lenis negative,section_lengthis too small to hold the full record, yetpei_lenandctx_lenwere derived from err_info_num/context_info_num and may describe regions beyond the (long)err .. err +section_lengthbuffer. To preventtrace_arm_eventfrom reading past the allocated record, sanitize the parameters:
move the cpu lookup above this path so it is available for tracing, recalculatectx_lenandpei_lenbased onsection_length, limit them, set the corresponding pointers to NULL and lengths to 0 when there is no remaining space.
Quoted 1 line
Please do this in two patches, one for a single issue fix.
I will change it in next version.
Quoted 28 lines
Quoted 28 lines
Fixes 87880af2d24e ("APEI/GHES: ARM processor Error: don't go past allocated memory")Signed-off-by Abbott Liu <[email protected]>--- drivers/ras/ras.c | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-)drivers/ras/ras.c +2
-2@@ -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;@@ -74,27 +74,37 @@ 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 );
Quoted 6 lines
drivers/ras/ras.c void log_arm_hw_error(struct cper_sec_proc_arm *err, const u8 sev) · line 79
Quoted 4 lines
drivers/ras/ras.c +1
-2-if (sz + (long )ctx_info - (long )err >= err->section_length) +if (sz + (long )ctx_info - (long )err <= err->section_length) sz += ctx_info->size; -Please leave a empty line here as it is.
I will change it in next version.
Quoted 3 lines
Thanks
Hanjun