projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eb38be6
)
x86/kaslr: Small cleanup of find_random_phys_addr()
author
Arvind Sankar
<nivedita@alum.mit.edu>
Tue, 28 Jul 2020 22:57:18 +0000
(18:57 -0400)
committer
Ingo Molnar
<mingo@kernel.org>
Fri, 31 Jul 2020 09:08:17 +0000
(11:08 +0200)
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
patch
|
blob
|
history
diff --git
a/arch/x86/boot/compressed/kaslr.c
b/arch/x86/boot/compressed/kaslr.c
index
ce34a05
..
ecdf33d
100644
(file)
--- 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();
}