efistub/x86: Use struct boot_e820_entry for size calculations
PATCH 1/1 efistub/x86: Use struct boot_e820_entry for size calculations
alloc_e820ext() and setup_e820() use sizeof(struct e820_entry) when calculating the sizes of boot_e820_entry structures.
Even though struct e820_entry and struct boot_e820_entry have the same size, use sizeof(struct boot_e820_entry) for consistency instead.
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/firmware/efi/libstub/x86-stub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/firmware/efi/libstub/x86-stub.c +2 -2
@@ -648,7 +648,7 @@ setup_e820(struct boot_params *params, struct setup_data *e820ext, u32 e820ext_s }if (nr_entries ==ARRAY_SIZE (params->e820_table)) { -u32 need = (nr_desc - i) *sizeof (struct e820_entry ) + +u32 need = (nr_desc - i) *sizeof (struct boot_e820_entry ) +sizeof (struct setup_data );if (!e820ext || e820ext_size < need)
@@ -684,7 +684,7 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext,unsigned long size; size =sizeof (struct setup_data ) + -sizeof (struct e820_entry ) * nr_desc; +sizeof (struct boot_e820_entry ) * nr_desc;if (*e820ext) {efi_bs_call (free_pool, *e820ext);
Quoted 11 lines · Thorsten Blum
alloc_e820ext()andsetup_e820()usesizeof(struct e820_entry)when calculating the sizes ofboot_e820_entrystructures.Even though struct
e820_entryand structboot_e820_entryhave the same size, usesizeof(struct boot_e820_entry)for consistency instead.Signed-off-by Thorsten Blum <[email protected]>--- drivers/firmware/efi/libstub/x86-stub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Queued up in efi/next - thanks.
Quoted 25 lines
drivers/firmware/efi/libstub/x86-stub.c +0
-0@@ -648,7 +648,7 @@ setup_e820(struct boot_params *params, struct
setup_data*e820ext, u32e820ext_sdrivers/firmware/efi/libstub/x86-stub.c +2
-2}if (nr_entries ==ARRAY_SIZE (params->e820_table)) { -u32 need = (nr_desc - i) *sizeof (struct e820_entry ) + +u32 need = (nr_desc - i) *sizeof (struct boot_e820_entry ) +sizeof (struct setup_data );if (!e820ext || e820ext_size < need)@@ -684,7 +684,7 @@ static efi_status_t alloc_e820ext(u32 nr_desc,struct setup_data **e820ext, unsigned long size; size =sizeof (struct setup_data ) + -sizeof (struct e820_entry ) * nr_desc; +sizeof (struct boot_e820_entry ) * nr_desc;if (*e820ext) {
efi_bs_call(free_pool, *e820ext);