lkml.org 
[lkml]   [2013]   [Aug]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 07/16] Allow efi_free() to be called with size of 0, and do nothing in that case.
    Date
    Make efi_free() safely callable with size of 0, similar to free() being
    callable with NULL pointers.
    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>
    ---
    arch/x86/boot/compressed/eboot.c | 3 +--
    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 f44ef2f..bcfdcc2 100644
    --- a/arch/x86/boot/compressed/eboot.c
    +++ b/arch/x86/boot/compressed/eboot.c
    @@ -537,8 +537,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 647b3ba..c45e287 100644
    --- a/drivers/firmware/efi/efi-stub-helper.c
    +++ b/drivers/firmware/efi/efi-stub-helper.c
    @@ -253,6 +253,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);
    }
    --
    1.7.10.4


    \
     
     \ /
      Last update: 2013-08-10 03:01    [W:4.025 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site