[tip:,x86/boot] x86/boot: efistub: Assign global boot_params variable

Message ID 169762525684.3135.6443175198415541833.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/boot] x86/boot: efistub: Assign global boot_params variable |

Commit Message

tip-bot2 for Thomas Gleixner Oct. 18, 2023, 10:34 a.m. UTC
  The following commit has been merged into the x86/boot branch of tip:

Commit-ID:     50dcc2e0d62e3c4a54f39673c4dc3dcde7c74d52
Gitweb:        https://git.kernel.org/tip/50dcc2e0d62e3c4a54f39673c4dc3dcde7c74d52
Author:        Ard Biesheuvel <ardb@kernel.org>
AuthorDate:    Tue, 17 Oct 2023 15:25:13 +02:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Wed, 18 Oct 2023 12:03:04 +02:00

x86/boot: efistub: Assign global boot_params variable

Now that the x86 EFI stub calls into some APIs exposed by the
decompressor (e.g., kaslr_get_random_long()), it is necessary to ensure
that the global boot_params variable is set correctly before doing so.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org
---
 drivers/firmware/efi/libstub/x86-stub.c | 2 ++
 1 file changed, 2 insertions(+)
  

Patch

diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
index 3bfc596..76cc0d0 100644
--- a/drivers/firmware/efi/libstub/x86-stub.c
+++ b/drivers/firmware/efi/libstub/x86-stub.c
@@ -818,6 +818,8 @@  void __noreturn efi_stub_entry(efi_handle_t handle,
 	unsigned long kernel_entry;
 	efi_status_t status;
 
+	boot_params_ptr = boot_params;
+
 	efi_system_table = sys_table_arg;
 	/* Check if we were booted by the EFI firmware */
 	if (efi_system_table->hdr.signature != EFI_SYSTEM_TABLE_SIGNATURE)