diff mbox

[U-Boot,5/6] efi_loader: Keep memory mapping sorted when splitting an entry

Message ID fcac49e15bab487f8296bbcc3c50c262@rwthex-w2-b.rwth-ad.de
State Accepted
Commit b6a951727504d4159467ac98434849f81aaf9ffa
Headers show

Commit Message

Stefan Brüns Sept. 30, 2016, 12:03 a.m. UTC
The code assumes sorted mappings in descending address order. When
splitting a mapping, insert the new part next to the current mapping.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
---
 lib/efi_loader/efi_memory.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Alexander Graf Sept. 30, 2016, 12:37 p.m. UTC | #1
On 30.09.16 02:03, Stefan Brüns wrote:
> The code assumes sorted mappings in descending address order. When
> splitting a mapping, insert the new part next to the current mapping.
> 
> Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>

I wonder why I didn't do that. Hm. Oh well.

Reviewed-by: Alexander Graf <agraf@suse.de>
diff mbox

Patch

diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index 763b79f..0fcfb7a 100644
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -122,7 +122,8 @@  static int efi_mem_carve_out(struct efi_mem_list *map,
 	newmap->desc = map->desc;
 	newmap->desc.physical_start = carve_start;
 	newmap->desc.num_pages = (map_end - carve_start) >> EFI_PAGE_SHIFT;
-        list_add_tail(&newmap->link, &efi_mem);
+	/* Insert before current entry (descending address order) */
+	list_add_tail(&newmap->link, &map->link);
 
 	/* Shrink the map to [ map_start ... carve_start ] */
 	map_desc->num_pages = (carve_start - map_start) >> EFI_PAGE_SHIFT;