Re: [PATCH 1/2] efi/libstub: Simplify check_image_region()

[Ard Biesheuvel]

On Sun, 30 Aug 2026, at 12:29, Thorsten Blum wrote:
> 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 <blum@xxxxxxxxxx>
> ---
>  drivers/firmware/efi/libstub/kaslr.c | 11 ++++-------
>  1 file changed, 4 insertions(+), 7 deletions(-)
>

Both patches applied to efi/next - thanks.

> diff --git a/drivers/firmware/efi/libstub/kaslr.c 
> b/drivers/firmware/efi/libstub/kaslr.c
> index 4bc963e999eb..17549bf3dc3e 100644
> --- a/drivers/firmware/efi/libstub/kaslr.c
> +++ b/drivers/firmware/efi/libstub/kaslr.c
> @@ -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;
>  }
> 
>  /**