| From | Arvind Sankar <> | Subject | [PATCH v3 17/21] x86/kaslr: Small cleanup of find_random_phys_addr | Date | Tue, 28 Jul 2020 18:57:18 -0400 |
| |
Just a trivial rearrangement to do all the processing together, and only have one call to slots_fetch_random in the source.
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> --- arch/x86/boot/compressed/kaslr.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index 4fd60eff048f..0e103d4d452e 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -812,10 +812,9 @@ static unsigned long find_random_phys_addr(unsigned long minimum, return 0; } - if (process_efi_entries(minimum, image_size)) - return slots_fetch_random(); + if (!process_efi_entries(minimum, image_size)) + process_e820_entries(minimum, image_size); - process_e820_entries(minimum, image_size); return slots_fetch_random(); } -- 2.26.2
|