On Mon, Sep 21, 2020 at 07:51:10AM -0400, Trammell Hudson wrote:
> The config file, kernel, initrd, etc should only be freed if they
> are allocated with the UEFI allocator.
>
> Signed-off-by: Trammell Hudson <[email protected]>
> Reviewed-by: Roger Pau Monné <[email protected]>
> ---
> xen/common/efi/boot.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
> index 157fe0e8c5..c2ce0c7294 100644
> --- a/xen/common/efi/boot.c
> +++ b/xen/common/efi/boot.c
> @@ -102,6 +102,7 @@ union string {
>
> struct file {
> UINTN size;
> + bool need_to_free;
> union {
> EFI_PHYSICAL_ADDRESS addr;
> char *str;
> @@ -280,13 +281,13 @@ void __init noreturn blexit(const CHAR16 *str)
> if ( !efi_bs )
> efi_arch_halt();
>
> - if ( cfg.addr )
> + if ( cfg.need_to_free )
If you drop the addr check here...
> efi_bs->FreePages(cfg.addr, PFN_UP(cfg.size));
> - if ( kernel.addr )
> + if ( kernel.need_to_free )
> efi_bs->FreePages(kernel.addr, PFN_UP(kernel.size));
> - if ( ramdisk.addr )
> + if ( ramdisk.need_to_free )
> efi_bs->FreePages(ramdisk.addr, PFN_UP(ramdisk.size));
> - if ( xsm.addr )
> + if ( xsm.need_to_free )
> efi_bs->FreePages(xsm.addr, PFN_UP(xsm.size));
>
> efi_arch_blexit();
> @@ -581,6 +582,7 @@ static bool __init read_file(EFI_FILE_HANDLE dir_handle,
> CHAR16 *name,
> }
> else
> {
> + file->need_to_free = true;
... I think you need to clear need_to_free if AllocatePages fails?
Thanks, Roger.
