| Message ID | 20210324145435.19753-1-changbin.du@gmail.com |
|---|---|
| State | Accepted |
| Commit | 668a84c1bfb2b3fd5a10847825a854d63fac7baa |
| Headers | show |
| Series | efi/fdt: fix panic when no valid fdt found | expand |
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 >
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)
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(+)