* [PATCH] efi/fdt: fix panic when no valid fdt found
@ 2021-03-24 14:54 Changbin Du
2021-03-26 13:57 ` Ard Biesheuvel
0 siblings, 1 reply; 2+ messages in thread
From: Changbin Du @ 2021-03-24 14:54 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: linux-efi, linux-kernel, Changbin Du
setup_arch() would invoke efi_init()->efi_get_fdt_params(). If no
valid fdt found then initial_boot_params will be null. So we
should stop further fdt processing here. I encountered this
issue on risc-v.
Signed-off-by: Changbin Du <changbin.du@gmail.com>
---
drivers/firmware/efi/fdtparams.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/firmware/efi/fdtparams.c b/drivers/firmware/efi/fdtparams.c
index bb042ab7c2be..e901f8564ca0 100644
--- a/drivers/firmware/efi/fdtparams.c
+++ b/drivers/firmware/efi/fdtparams.c
@@ -98,6 +98,9 @@ u64 __init efi_get_fdt_params(struct efi_memory_map_data *mm)
BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(name));
BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(dt_params[0].params));
+ if (!fdt)
+ return 0;
+
for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
node = fdt_path_offset(fdt, dt_params[i].path);
if (node < 0)
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] efi/fdt: fix panic when no valid fdt found
2021-03-24 14:54 [PATCH] efi/fdt: fix panic when no valid fdt found Changbin Du
@ 2021-03-26 13:57 ` Ard Biesheuvel
0 siblings, 0 replies; 2+ messages in thread
From: Ard Biesheuvel @ 2021-03-26 13:57 UTC (permalink / raw)
To: Changbin Du; +Cc: linux-efi, Linux Kernel Mailing List
On Wed, 24 Mar 2021 at 15:54, Changbin Du <changbin.du@gmail.com> wrote:
>
> setup_arch() would invoke efi_init()->efi_get_fdt_params(). If no
> valid fdt found then initial_boot_params will be null. So we
> should stop further fdt processing here. I encountered this
> issue on risc-v.
>
> Signed-off-by: Changbin Du <changbin.du@gmail.com>
I'll queue this up, thanks.
> ---
> drivers/firmware/efi/fdtparams.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/firmware/efi/fdtparams.c b/drivers/firmware/efi/fdtparams.c
> index bb042ab7c2be..e901f8564ca0 100644
> --- a/drivers/firmware/efi/fdtparams.c
> +++ b/drivers/firmware/efi/fdtparams.c
> @@ -98,6 +98,9 @@ u64 __init efi_get_fdt_params(struct efi_memory_map_data *mm)
> BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(name));
> BUILD_BUG_ON(ARRAY_SIZE(target) != ARRAY_SIZE(dt_params[0].params));
>
> + if (!fdt)
> + return 0;
> +
> for (i = 0; i < ARRAY_SIZE(dt_params); i++) {
> node = fdt_path_offset(fdt, dt_params[i].path);
> if (node < 0)
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-26 13:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-24 14:54 [PATCH] efi/fdt: fix panic when no valid fdt found Changbin Du
2021-03-26 13:57 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).