Skip to contentSkip to conversation

RAS: Fix inverted context info bounds check in ARM processor errors

PATCH Liuwenliang (Abbott Liu) 1 participant 1 message Sep 21

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi Hanjun,

Thank you for the review.

Quoted 25 lines · Hanjun Guo
Quoted 24 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(), the ctx_info bounds check is inverted. The condition "sz + (long)ctx_info - (long)err >= err->section_length" adds ctx_info->size when the context header is already past the end of the section instead of when it is within bounds. So change the comparison to <=.

Fixes 87880af2d24e ("APEI/GHES: ARM processor Error: don't go past allocated memory")
---
  drivers/ras/ras.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ras/ras.c +0 -0
index 03df3db62334..2540538a16a8 100644
@@ -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);
 
Quoted 8 lines

drivers/ras/ras.c void log_arm_hw_error(struct cper_sec_proc_arm *err, const u8 sev) · line 80

Quoted 6 lines
drivers/ras/ras.c +1 -1
-		if (sz + (long)ctx_info - (long)err >= err->section_length)
+		if (sz + (long)ctx_info - (long)err <= err->section_length)
  			sz += ctx_info->size;
 
  		ctx_info = (struct cper_arm_ctx_info *)((long)ctx_info + sz);

Thanks, I will add your Reviewed-by tag in v5, there will be no code changes in that version, so the tag remains valid.

Quoted 3 lines

Thanks
Hanjun