diff options
| author |   Joerg Roedel <jroedel@suse.de> | 2020-09-07 15:15:17 +0200 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2020-09-07 19:45:25 +0200 |
| commit | ca0e22d4f011a56e974fa3a712d76e86a791559d (patch) | |
| tree | 6a4f203a78723d5e52d3d140fd2fac516cbe0ead /arch/x86/boot/compressed/kaslr.c | |
| parent | x86/boot/compressed/64: Add page-fault handler (diff) | |
| download | linux-dev-ca0e22d4f011a56e974fa3a712d76e86a791559d.tar.xz linux-dev-ca0e22d4f011a56e974fa3a712d76e86a791559d.zip | |
x86/boot/compressed/64: Always switch to own page table
When booted through startup_64(), the kernel keeps running on the EFI
page table until the KASLR code sets up its own page table. Without
KASLR, the pre-decompression boot code never switches off the EFI page
table. Change that by unconditionally switching to a kernel-controlled
page table after relocation.
This makes sure the kernel can make changes to the mapping when
necessary, for example map pages unencrypted in SEV and SEV-ES guests.
Also, remove the debug_putstr() calls in initialize_identity_maps()
because the function now runs before console_init() is called.
[ bp: Massage commit message. ]
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Link: https://lkml.kernel.org/r/20200907131613.12703-17-joro@8bytes.org
Diffstat (limited to 'arch/x86/boot/compressed/kaslr.c')
| -rw-r--r-- | arch/x86/boot/compressed/kaslr.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index e27de98ed038..82662869c4cb 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -861,9 +861,6 @@ void choose_random_location(unsigned long input, boot_params->hdr.loadflags |= KASLR_FLAG; - /* Prepare to add new identity pagetables on demand. */ - initialize_identity_maps(); - if (IS_ENABLED(CONFIG_X86_32)) mem_limit = KERNEL_IMAGE_SIZE; else |