| Message ID | 1529656712-3660-7-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Commit | dd099ec44b5d0a5d2dff537fc5b3b3441a49eec6 |
| Delegated to: | Bin Meng |
| Headers | show |
| Series | x86: efi: payload: Various fixes | expand |
On 22 June 2018 at 02:38, Bin Meng <bmeng.cn@gmail.com> wrote: > Each entry of the EFI memory descriptors occupies map->desc_size, > not sizeof(struct efi_mem_desc). > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > --- > > cmd/efi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Sat, Jun 23, 2018 at 3:28 AM, Simon Glass <sjg@chromium.org> wrote: > On 22 June 2018 at 02:38, Bin Meng <bmeng.cn@gmail.com> wrote: >> Each entry of the EFI memory descriptors occupies map->desc_size, >> not sizeof(struct efi_mem_desc). >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> >> --- >> >> cmd/efi.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86, thanks!
diff --git a/cmd/efi.c b/cmd/efi.c index 2511c6c..6c1eb88 100644 --- a/cmd/efi.c +++ b/cmd/efi.c @@ -83,7 +83,7 @@ void *efi_build_mem_table(struct efi_entry_memmap *map, int size, bool skip_bs) prev = NULL; addr = 0; dest = base; - end = base + count; + end = (struct efi_mem_desc *)((ulong)base + count * map->desc_size); for (desc = base; desc < end; desc = efi_get_next_mem_desc(map, desc)) { bool merge = true; int type = desc->type;
Each entry of the EFI memory descriptors occupies map->desc_size, not sizeof(struct efi_mem_desc). Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- cmd/efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)