Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88f8abd5 authored by Dave Young's avatar Dave Young Committed by Matt Fleming
Browse files

arm64/efi: uefi_init error handling fix 



There's one early memmap leak in uefi_init error path, fix it and
slightly tune the error handling code.

Signed-off-by: default avatarDave Young <dyoung@redhat.com>
Acked-by: default avatarMark Salter <msalter@redhat.com>
Reported-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent 5ae3683c

arch/arm64/kernel/efi.c

+4 −3
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ static int __init uefi_init(void) 
	 */

	if (efi.systab->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE) {

		pr_err("System table signature incorrect\n");

		return -EINVAL;

		retval = -EINVAL;

		goto out;

	}

	if ((efi.systab->hdr.revision >> 16) < 2)

		pr_warn("Warning: EFI system table version %d.%02d, expected 2.00 or greater\n",
@@ -103,6 +104,7 @@ static int __init uefi_init(void) 
		for (i = 0; i < (int) sizeof(vendor) - 1 && *c16; ++i)

			vendor[i] = c16[i];

		vendor[i] = '\0';

		early_memunmap(c16, sizeof(vendor));

	}



	pr_info("EFI v%u.%.02u by %s\n",
@@ -113,9 +115,8 @@ static int __init uefi_init(void) 
	if (retval == 0)

		set_bit(EFI_CONFIG_TABLES, &efi.flags);



	early_memunmap(c16, sizeof(vendor));

out:

	early_memunmap(efi.systab,  sizeof(efi_system_table_t));



	return retval;

}