efi/cper: 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.

Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

diff --git a/drivers/firmware/efi/cper-x86.c b/drivers/firmware/efi/cper-x86.c
index 438ed9eff6d01e7d03e3d91d5089448d5d3cb18c..3949d7b5e808f873f952a6231e993599a1942b06 100644 (file)
--- a/drivers/firmware/efi/cper-x86.c
+++ b/drivers/firmware/efi/cper-x86.c
@@ -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);