| Message ID | 20200327052800.11022-3-xypron.glpk@gmx.de |
|---|---|
| State | Accepted |
| Commit | 4ef2b0d5512857c1af1110a0b23744c00a585cb2 |
| Headers | show |
| Series | efi_loader: non-volatile and runtime variables | expand |
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 3bbe2d6a1a..aaed575505 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -199,7 +199,8 @@ static void efi_carve_out_dt_rsv(void *fdt) * The /reserved-memory node may have children with * a size instead of a reg property. */ - if (addr != FDT_ADDR_T_NONE) + if (addr != FDT_ADDR_T_NONE && + fdtdec_get_is_enabled(fdt, subnode)) efi_reserve_memory(addr, size); subnode = fdt_next_subnode(fdt, subnode); }
Sub-nodes of /reserved-memory may be disabled. In this case we should not reserve memory in the memory map. Reported-by: Patrick DELAUNAY <patrick.delaunay at st.com> Fixes: fef907b2e440 ("efi_loader: create reservations after ft_board_setup") Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de> Reviewed-by: Atish Patra <atish.patra at wdc.com> --- cmd/bootefi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.25.1