diff options
| author | Roy Franz <roy.franz@linaro.org> | 2013-09-23 00:45:38 +0200 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-09-25 13:34:42 +0200 |
| commit | 0e1cadb05bba2293b4575c8cab275313d181d94f (patch) | |
| tree | 67b3d6a3c48b3fcaad7a5232b84930ca7a678798 | |
| parent | efi: use efi_get_memory_map() to get final map for x86 (diff) | |
| download | linux-0e1cadb05bba2293b4575c8cab275313d181d94f.tar.xz linux-0e1cadb05bba2293b4575c8cab275313d181d94f.zip | |
efi: Allow efi_free() to be called with size of 0
Make efi_free() safely callable with size of 0, similar to free() being
callable with NULL pointers, and do nothing in that case.
Remove size checks that this makes redundant. This also avoids some
size checks in the ARM EFI stub code that will be added as well.
Signed-off-by: Roy Franz <roy.franz@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | arch/x86/boot/compressed/eboot.c | 3 | ||||
| -rw-r--r-- | drivers/firmware/efi/efi-stub-helper.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c index bf2c35d5ec1f..ef2181a96d09 100644 --- a/arch/x86/boot/compressed/eboot.c +++ b/arch/x86/boot/compressed/eboot.c @@ -506,8 +506,7 @@ struct boot_params *make_boot_params(void *handle, efi_system_table_t *_table) return boot_params; fail2: - if (options_size) - efi_free(sys_table, options_size, hdr->cmd_line_ptr); + efi_free(sys_table, options_size, hdr->cmd_line_ptr); fail: efi_free(sys_table, 0x4000, (unsigned long)boot_params); return NULL; diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c index b314bf720272..fda510fa3579 100644 --- a/drivers/firmware/efi/efi-stub-helper.c +++ b/drivers/firmware/efi/efi-stub-helper.c @@ -255,6 +255,9 @@ static void efi_free(efi_system_table_t *sys_table_arg, unsigned long size, { unsigned long nr_pages; + if (!size) + return; + nr_pages = round_up(size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE; efi_call_phys2(sys_table_arg->boottime->free_pages, addr, nr_pages); } |