On Fri, 2 Oct 2026 20:31:40 -0300
Jason Gunthorpe <[email protected]> wrote:
> Sashiko points out that efi_handle_cmdline() allocates this memory and
> hands it over to the caller. If efi_pe_entry() ever returns it should be
> freed. Add a __free annotation.
>
> Fixes: 42c8ea3dca09 ("efi: libstub: Factor out EFI stub entrypoint into
> separate file")
> Signed-off-by: Jason Gunthorpe <[email protected]>
Seems sensible.
If anyone has more time than either of us, I note the efi_handle_cmdline()
use of __free() should move down to the point of allocation.
It's only a couple of lines, but none the less...
Reviewed-by: Jonathan Cameron <[email protected]>
> ---
> drivers/firmware/efi/libstub/efi-stub-entry.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/libstub/efi-stub-entry.c
> b/drivers/firmware/efi/libstub/efi-stub-entry.c
> index aa85e910fe595e..fc1282fb442e71 100644
> --- a/drivers/firmware/efi/libstub/efi-stub-entry.c
> +++ b/drivers/firmware/efi/libstub/efi-stub-entry.c
> @@ -40,7 +40,6 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
> unsigned long image_addr;
> unsigned long image_size = 0;
> /* addr/point and size pairs for memory management*/
> - char *cmdline_ptr = NULL;
> efi_guid_t loaded_image_proto = LOADED_IMAGE_PROTOCOL_GUID;
> unsigned long reserve_addr = 0;
> unsigned long reserve_size = 0;
> @@ -63,6 +62,7 @@ efi_status_t __efiapi efi_pe_entry(efi_handle_t handle,
> return status;
> }
>
> + char *cmdline_ptr __free(efi_pool) = NULL;
> status = efi_handle_cmdline(image, &cmdline_ptr);
> if (status != EFI_SUCCESS)
> return status;
