The following commit has been merged into the x86/kaslr branch of tip:
Commit-ID: 79c2fd2afe55944098047721c33e06fd48654e57
Gitweb: https://git.kernel.org/tip/79c2fd2afe55944098047721c33e06fd48654e57
Author: Arvind Sankar <nivedita@xxxxxxxxxxxx>
AuthorDate: Tue, 28 Jul 2020 18:57:11 -04:00
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitterDate: Fri, 31 Jul 2020 11:08:17 +02:00
x86/kaslr: Fix off-by-one error in process_gb_huge_pages()
If the remaining size of the region is exactly 1Gb, there is still one
hugepage that can be reserved.
Signed-off-by: Arvind Sankar <nivedita@xxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20200728225722.67457-11-nivedita@xxxxxxxxxxxx
---
arch/x86/boot/compressed/kaslr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c
index d074986..0df513e 100644
--- a/arch/x86/boot/compressed/kaslr.c
+++ b/arch/x86/boot/compressed/kaslr.c
@@ -562,7 +562,7 @@ process_gb_huge_pages(struct mem_vector *region, unsigned long image_size)
size = region->size - (addr - region->start);
/* Check how many 1GB huge pages can be filtered out: */
- while (size > PUD_SIZE && max_gb_huge_pages) {
+ while (size >= PUD_SIZE && max_gb_huge_pages) {
size -= PUD_SIZE;
max_gb_huge_pages--;
i++;
|