Skip to contentSkip to conversation

drivers/firmware/efi: Fix cper_ia_proc_ctx alignment

PATCH In review Patrick Rudolph 2 participants 2 messages Feb 21, 2025

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

PATCH 1/1 drivers/firmware/efi: Fix cper_ia_proc_ctx alignment

According to the UEFI Common Platform Error Record appendix, the IA32/X64 Processor Context Information Structure is a variable length structure, but "is padded with zeros if the size is not a multiple of 16 bytes".

Currently this isn't honoured, causing all but the first structure to be garbage when printed. Thus align the size to be a multiple of 16.

---
 drivers/firmware/efi/cper-x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/cper-x86.c +1 -1
index 438ed9eff6d0..3949d7b5e808 100644
@@ -325,7 +325,7 @@ void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
 
 	ctx_info = (struct cper_ia_proc_ctx *)err_info;
 	for (i = 0; i < VALID_PROC_CXT_INFO_NUM(proc->validation_bits); i++) {
-		int size = sizeof(*ctx_info) + ctx_info->reg_arr_size;
+		int size = ALIGN(sizeof(*ctx_info) + ctx_info->reg_arr_size, 16);
 		int groupsize = 4;
 
 		printk("%sContext Information Structure %d:\n", pfx, i);
Signature · 1 line
2.48.1
maintainer
#1 lore raw
Quoted 19 lines · Patrick Rudolph

According to the UEFI Common Platform Error Record appendix, the IA32/X64 Processor Context Information Structure is a variable length structure, but "is padded with zeros if the size is not a multiple of 16 bytes".

Currently this isn't honoured, causing all but the first structure to be garbage when printed. Thus align the size to be a multiple of 16.

---
 drivers/firmware/efi/cper-x86.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/firmware/efi/cper-x86.c +0 -0
index 438ed9eff6d0..3949d7b5e808 100644

drivers/firmware/efi/cper-x86.c void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc) · line 331

Quoted 8 lines
drivers/firmware/efi/cper-x86.c +1 -1
@@ -325,7 +325,7 @@ void cper_print_proc_ia(const char *pfx, const struct cper_sec_proc_ia *proc)
 
        ctx_info = (struct cper_ia_proc_ctx *)err_info;
        for (i = 0; i < VALID_PROC_CXT_INFO_NUM(proc->validation_bits); i++) {
-               int size = sizeof(*ctx_info) + ctx_info->reg_arr_size;
+               int size = ALIGN(sizeof(*ctx_info) + ctx_info->reg_arr_size, 16);
                int groupsize = 4;
 
                printk("%sContext Information Structure %d:\n", pfx, i);

Thanks for the patch. It seems ARM suffers from the same issue, mind fixing that too?