Re: [PATCH 1/1] bootmeth: pass size to efi_binary_run()

2023-12-22 Thread Tom Rini 
On Fri, Dec 22, 2023 at 05:46:11PM +0200, Ilias Apalodimas wrote:
> On Fri, 22 Dec 2023 at 17:43, Peter Robinson  wrote:
> >
> > On Fri, Dec 22, 2023 at 3:37 PM Tom Rini  wrote:
> > >
> > > On Fri, 22 Dec 2023 16:01:56 +0100, Heinrich Schuchardt wrote:
> > >
> > > > If we call efi_binary_run() with size parameter set to zero, we get an 
> > > > error
> > > >
> > > >  Not a PE-COFF file
> > > >
> > > > Fill the missing value.
> > > >
> > > >
> > > > [...]
> > >
> > > Applied to u-boot/next, thanks!
> >
> > Is this a fix that should land for 2024.01?
> 
> I was about to ask the same. I think it should go into -master as well

This specifically fixes the merge of -rc5 in to -next however.

-- 
Tom


signature.asc
Description: PGP signature

Re: [PATCH 1/1] bootmeth: pass size to efi_binary_run()

2023-12-22 Thread Ilias Apalodimas 
On Fri, 22 Dec 2023 at 17:43, Peter Robinson  wrote:
>
> On Fri, Dec 22, 2023 at 3:37 PM Tom Rini  wrote:
> >
> > On Fri, 22 Dec 2023 16:01:56 +0100, Heinrich Schuchardt wrote:
> >
> > > If we call efi_binary_run() with size parameter set to zero, we get an 
> > > error
> > >
> > >  Not a PE-COFF file
> > >
> > > Fill the missing value.
> > >
> > >
> > > [...]
> >
> > Applied to u-boot/next, thanks!
>
> Is this a fix that should land for 2024.01?

I was about to ask the same. I think it should go into -master as well

Thanks
/Ilias

Re: [PATCH 1/1] bootmeth: pass size to efi_binary_run()

2023-12-22 Thread Peter Robinson 
On Fri, Dec 22, 2023 at 3:37 PM Tom Rini  wrote:
>
> On Fri, 22 Dec 2023 16:01:56 +0100, Heinrich Schuchardt wrote:
>
> > If we call efi_binary_run() with size parameter set to zero, we get an error
> >
> >  Not a PE-COFF file
> >
> > Fill the missing value.
> >
> >
> > [...]
>
> Applied to u-boot/next, thanks!

Is this a fix that should land for 2024.01?

Re: [PATCH 1/1] bootmeth: pass size to efi_binary_run()

2023-12-22 Thread Tom Rini 
On Fri, 22 Dec 2023 16:01:56 +0100, Heinrich Schuchardt wrote:

> If we call efi_binary_run() with size parameter set to zero, we get an error
> 
>  Not a PE-COFF file
> 
> Fill the missing value.
> 
> 
> [...]

Applied to u-boot/next, thanks!

-- 
Tom

Re: [PATCH 1/1] bootmeth: pass size to efi_binary_run()

2023-12-22 Thread Ilias Apalodimas 
On Fri, 22 Dec 2023 at 17:02, Heinrich Schuchardt  wrote:
>
> If we call efi_binary_run() with size parameter set to zero, we get an error
>
>  Not a PE-COFF file
>
> Fill the missing value.
>
> Fixes: 1373ffde52e1 ("Merge tag 'v2024.01-rc5' into next")
> Fixes: 7017fc54a5bc ("bootmeth: use efi_loader interfaces instead of bootefi 
> command")
> Signed-off-by: Heinrich Schuchardt 
> ---
>  boot/bootmeth_efi.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c
> index 00060f7d25..c4eb331d69 100644
> --- a/boot/bootmeth_efi.c
> +++ b/boot/bootmeth_efi.c
> @@ -454,12 +454,12 @@ static int distro_efi_boot(struct udevice *dev, struct 
> bootflow *bflow)
>
> if (bflow->flags & BOOTFLOWF_USE_BUILTIN_FDT) {
> log_debug("Booting with built-in fdt\n");
> -   if (efi_binary_run(map_sysmem(kernel, 0), 0,
> +   if (efi_binary_run(map_sysmem(kernel, 0), bflow->size,
>EFI_FDT_USE_INTERNAL))
> return log_msg_ret("run", -EINVAL);
> } else {
> log_debug("Booting with external fdt\n");
> -   if (efi_binary_run(map_sysmem(kernel, 0), 0,
> +   if (efi_binary_run(map_sysmem(kernel, 0), bflow->size,
>map_sysmem(fdt, 0)))
> return log_msg_ret("run", -EINVAL);
> }
> --
> 2.43.0
>
Reviewed-by: Ilias Apalodimas

[PATCH 1/1] bootmeth: pass size to efi_binary_run()

2023-12-22 Thread Heinrich Schuchardt 
If we call efi_binary_run() with size parameter set to zero, we get an error

 Not a PE-COFF file

Fill the missing value.

Fixes: 1373ffde52e1 ("Merge tag 'v2024.01-rc5' into next")
Fixes: 7017fc54a5bc ("bootmeth: use efi_loader interfaces instead of bootefi 
command")
Signed-off-by: Heinrich Schuchardt 
---
 boot/bootmeth_efi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c
index 00060f7d25..c4eb331d69 100644
--- a/boot/bootmeth_efi.c
+++ b/boot/bootmeth_efi.c
@@ -454,12 +454,12 @@ static int distro_efi_boot(struct udevice *dev, struct 
bootflow *bflow)

if (bflow->flags & BOOTFLOWF_USE_BUILTIN_FDT) {
log_debug("Booting with built-in fdt\n");
-   if (efi_binary_run(map_sysmem(kernel, 0), 0,
+   if (efi_binary_run(map_sysmem(kernel, 0), bflow->size,
   EFI_FDT_USE_INTERNAL))
return log_msg_ret("run", -EINVAL);
} else {
log_debug("Booting with external fdt\n");
-   if (efi_binary_run(map_sysmem(kernel, 0), 0,
+   if (efi_binary_run(map_sysmem(kernel, 0), bflow->size,
   map_sysmem(fdt, 0)))
return log_msg_ret("run", -EINVAL);
}
--
2.43.0