| Message ID | 20250221111516.1468261-1-patrick.rudolph@9elements.com |
|---|---|
| State | New |
| Headers | show |
| Series | efi/cper: Fix cper_arm_ctx_info alignment | expand |
On Fri, 21 Feb 2025 at 12:15, Patrick Rudolph <patrick.rudolph@9elements.com> wrote: > > According to the UEFI Common Platform Error Record appendix, the > 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. > > Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Thanks. Both patched queued up now in efi/urgent > --- > drivers/firmware/efi/cper-arm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/firmware/efi/cper-arm.c b/drivers/firmware/efi/cper-arm.c > index fa9c1c3bf168..f0a63d09d3c4 100644 > --- a/drivers/firmware/efi/cper-arm.c > +++ b/drivers/firmware/efi/cper-arm.c > @@ -311,7 +311,7 @@ void cper_print_proc_arm(const char *pfx, > ctx_info = (struct cper_arm_ctx_info *)err_info; > max_ctx_type = ARRAY_SIZE(arm_reg_ctx_strs) - 1; > for (i = 0; i < proc->context_info_num; i++) { > - int size = sizeof(*ctx_info) + ctx_info->size; > + int size = ALIGN(sizeof(*ctx_info) + ctx_info->size, 16); > > printk("%sContext info structure %d:\n", pfx, i); > if (len < size) { > -- > 2.48.1 >
diff --git a/drivers/firmware/efi/cper-arm.c b/drivers/firmware/efi/cper-arm.c index fa9c1c3bf168..f0a63d09d3c4 100644 --- a/drivers/firmware/efi/cper-arm.c +++ b/drivers/firmware/efi/cper-arm.c @@ -311,7 +311,7 @@ void cper_print_proc_arm(const char *pfx, ctx_info = (struct cper_arm_ctx_info *)err_info; max_ctx_type = ARRAY_SIZE(arm_reg_ctx_strs) - 1; for (i = 0; i < proc->context_info_num; i++) { - int size = sizeof(*ctx_info) + ctx_info->size; + int size = ALIGN(sizeof(*ctx_info) + ctx_info->size, 16); printk("%sContext info structure %d:\n", pfx, i); if (len < size) {
According to the UEFI Common Platform Error Record appendix, the 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. Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> --- drivers/firmware/efi/cper-arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)