RAS: Fix inverted context info bounds check in ARM processor errors
Hi Hanjun, thinks for your review.
Quoted 13 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 a bug: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 4 lines
Quoted 2 lines
Fixes 87880af2d24e ("APEI/GHES: ARM processor Error: don't go past allocated memory")This empty line is not needed.
I am very sorry for making such a basic mistake; this issue will be resolved in the next version.
Quoted 22 lines
Quoted 11 lines
Signed-off-by Abbott Liu <[email protected]>--- drivers/ras/ras.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/ras/ras.c +0
-0drivers/ras/ras.c void log_arm_hw_error(struct cper_sec_proc_arm *err, const u8 sev) · line 78
Quoted 6 lines
drivers/ras/ras.c +1
-1@@ -74,7 +74,7 @@ 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) sz += ctx_info->size;sz is an int and
ctx_info->sizeis u32, ifctx_info->sizeis big enough for example over0x7fffffff, the sz will be negative.Quoted 1 line
Quoted 6 lines
Quoted 1 line
ctx_info = (struct cper_arm_ctx_info *)((long)ctx_info + sz);if the sz is negative, the
ctx_infomay pointer to a wrong place.
ctx_info->sizewill not over0x7fffffffin practical but should we consider the overflows?
I also think that it won't actually happen in practice, so there isn't much need to consider this overflow issue. But even if we do consider it, the code modifications wouldn't be too complex. I plan to fix it in the next version.
Quoted 6 lines
Thanks
HanjunQuoted 1 line