efi/libstub: Simplify check_image_region()
PATCH 1/2 efi/libstub: Simplify check_image_region()
Drop the local ret variable and the break statement by returning the result directly. Also use unsigned long for map_offset, since map_size and desc_size are both unsigned long.
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/firmware/efi/libstub/kaslr.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/firmware/efi/libstub/kaslr.c +4 -7
@@ -59,8 +59,7 @@ static bool check_image_region(u64 base, u64 size) { struct efi_boot_memmap *map __free(efi_pool) = NULL;efi_status_t status; -bool ret = false; -int map_offset; +unsigned long map_offset; status =efi_get_memory_map (&map, false);if (status !=EFI_SUCCESS )
@@ -74,13 +73,11 @@ static bool check_image_region(u64 base, u64 size)* Find the region that covers base, and return whether * it covers base+size bytes. */ -if (base >= md->phys_addr && base < end) { - ret = (base + size) <= end; -break ; - } +if (base >= md->phys_addr && base < end) +return (base + size) <= end; } -return ret; +return false; }/**
PATCH 2/2 efi/libstub: Fix grammar in efi_kaslr_relocate_kernel() comment
Fix the grammar in the kernel-doc comment and indent the @image_addr description correctly.
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/firmware/efi/libstub/kaslr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/efi/libstub/kaslr.c +3 -3
@@ -82,7 +82,7 @@ static bool check_image_region(u64 base, u64 size)/** * efi_kaslr_relocate_kernel() - Relocate the kernel (random if KASLR enabled) -* @image_addr: Pointer to the current kernel location +* @image_addr: Pointer to the current kernel location * @reserve_addr: Pointer to the relocated kernel location * @reserve_size: Size of the relocated kernel * @kernel_size: Size of the text + data
@@ -91,8 +91,8 @@ static bool check_image_region(u64 base, u64 size)* @phys_seed: Random seed used for the relocation * * If KASLR is not enabled, this function relocates the kernel to a fixed -* address (or leave it as its current location). If KASLR is enabled, the -* kernel physical location is randomized using the seed in parameter. +* address or leaves it at its current location. If KASLR is enabled, the +* kernel's physical location is randomized using the supplied seed. * * Return: status code, EFI_SUCCESS if relocation is successful */
Ard Biesheuvel
maintainerQuoted 9 lines · Thorsten Blum
Drop the local ret variable and the break statement by returning the result directly. Also use unsigned long for
map_offset, sincemap_sizeanddesc_sizeare both unsigned long.Signed-off-by Thorsten Blum <[email protected]>--- drivers/firmware/efi/libstub/kaslr.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
Both patches applied to efi/next - thanks.
Quoted 32 lines
drivers/firmware/efi/libstub/kaslr.c +4
-7@@ -59,8 +59,7 @@ static bool check_image_region(u64 base, u64 size) { struct efi_boot_memmap *map __free(efi_pool) = NULL;efi_status_t status; -bool ret = false; -int map_offset; +unsigned long map_offset; status =efi_get_memory_map (&map, false);if (status !=EFI_SUCCESS )@@ -74,13 +73,11 @@ static bool check_image_region(u64 base, u64 size)* Find the region that covers base, and return whether * it covers base+size bytes. */ -if (base >= md->phys_addr && base < end) { - ret = (base + size) <= end; -break ; - } +if (base >= md->phys_addr && base < end) +return (base + size) <= end; } -return ret; +return false; }/**