lkml.org 
[lkml]   [2020]   [Aug]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip: x86/kaslr] x86/kaslr: Small cleanup of find_random_phys_addr()
The following commit has been merged into the x86/kaslr branch of tip:

Commit-ID: 4268b4da572f8bde8bc2f3243927ff5795687a6f
Gitweb: https://git.kernel.org/tip/4268b4da572f8bde8bc2f3243927ff5795687a6f
Author: Arvind Sankar <nivedita@alum.mit.edu>
AuthorDate: Tue, 28 Jul 2020 18:57:18 -04:00
Committer: Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 31 Jul 2020 11:08:17 +02:00

x86/kaslr: Small cleanup of find_random_phys_addr()

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>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200728225722.67457-18-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 ce34a05..ecdf33d 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -813,10 +813,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();
}

\
 
 \ /
  Last update: 2020-08-07 01:40    [W:0.277 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site