random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-26 22:01:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

efi_memory: avoid possible null pointer dereference

Browse Source 
Populate the previous memory descriptor node pointer only after it's
parent struct has been initialised. The compiler fixes this logic to
do the right thing, but it is better to have correct code in place.

Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
This commit is contained in:
Sughosh Ganu 2024-07-30 16:41:30 +05:30 committed by Heinrich Schuchardt
parent 22f893047d
commit 7aa0addc42
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/efi_loader/efi_memory.c
View File

@ -138,7 +138,7 @@ static void efi_mem_sort(void)
merge_again = false;
list_for_each(lhandle, &efi_mem) {
struct efi_mem_list *lmem;
struct efi_mem_desc *prev = &prevmem->desc;
struct efi_mem_desc *prev;
struct efi_mem_desc *cur;
uint64_t pages;
@ -149,6 +149,7 @@ static void efi_mem_sort(void)
}
cur = &lmem->desc;
prev = &prevmem->desc;
if ((desc_get_end(cur) == prev->physical_start) &&
(prev->type == cur->type) &&