drivers/firmware/efi/libstub.c: prevent a relocation

This prevents a variable-reference relocation inside the EFI stub by using a wrapper API. Change-Id: I46f7827959a1f702dac42447277c3f7f1ba8612f Signed-off-by: Dan Aloni <[email protected]> Signed-off-by: Davide Garberi <[email protected]>
LineageOS · Nov 15, 2022 · aa345ee · aa345ee
1 parent d586a54
commit aa345ee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
@@ -18,6 +18,11 @@
 
 #include "efistub.h"
 
+bool efi__get___nokaslr(void)
+{
+	return nokaslr();
+}
+
 static int efi_secureboot_enabled(efi_system_table_t *sys_table_arg)
 {
 	static efi_guid_t const var_guid = EFI_GLOBAL_VARIABLE_GUID;

diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
@@ -38,7 +38,7 @@ efi_status_t __init handle_kernel_image(efi_system_table_t *sys_table_arg,
 	u64 phys_seed = 0;
 
 	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {
-		if (!nokaslr()) {
+		if (!efi__get___nokaslr()) {
 			status = efi_get_random_bytes(sys_table_arg,
 						      sizeof(phys_seed),
 						      (u8 *)&phys_seed);

diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h
@@ -9,6 +9,8 @@ extern int __pure nokaslr(void);
 
 void efi_char16_printk(efi_system_table_t *, efi_char16_t *);
 
+bool efi__get___nokaslr(void);
+
 efi_status_t efi_open_volume(efi_system_table_t *sys_table_arg, void *__image,
 			     void **__fh);