Skip to contentSkip to conversation

efi/arm64: libstub: Deal gracefully with EFI_RNG_PROTOCOL failure

PATCH In review Ard Biesheuvel 2 participants 5 messages Sep 26, 2020 – Sep 29, 2020 EFI

lore
Share & tools
lore

Ard Biesheuvel

author maintainer
#0 lore raw

PATCH 1/1 efi/arm64: libstub: Deal gracefully with EFI_RNG_PROTOCOL failure

Currently, on arm64, we abort on any failure from efi_get_random_bytes() other than EFI_NOT_FOUND when it comes to setting the physical seed for KASLR, but ignore such failures when obtaining the seed for virtual KASLR or for early seeding of the kernel's entropy pool via the config table. This is inconsistent, and may lead to unexpected boot failures.

So let's permit any failure for the physical seed, and simply report the error code if it does not equal EFI_NOT_FOUND.

---
 drivers/firmware/efi/libstub/arm64-stub.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/efi/libstub/arm64-stub.c +3 -3
index e5bfac79e5ac..21692a986beb 100644
@@ -62,10 +62,10 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
 			status = efi_get_random_bytes(sizeof(phys_seed),
 						      (u8 *)&phys_seed);
 			if (status == EFI_NOT_FOUND) {
-				efi_info("EFI_RNG_PROTOCOL unavailable, no randomness supplied\n");
+				efi_info("EFI_RNG_PROTOCOL unavailable, KASLR will be disabled\n");
 			} else if (status != EFI_SUCCESS) {
-				efi_err("efi_get_random_bytes() failed\n");
-				return status;
+				efi_err("efi_get_random_bytes() failed (0x%lx), KASLR will be disabled\n",
+					status);
 			}
 		} else {
 			efi_info("KASLR disabled on kernel command line\n");
Signature · 1 line
2.17.1
#1 lore raw
Quoted 11 lines · Ard Biesheuvel

Currently, on arm64, we abort on any failure from efi_get_random_bytes() other than EFI_NOT_FOUND when it comes to setting the physical seed for KASLR, but ignore such failures when obtaining the seed for virtual KASLR or for early seeding of the kernel's entropy pool via the config table. This is inconsistent, and may lead to unexpected boot failures.

So let's permit any failure for the physical seed, and simply report the error code if it does not equal EFI_NOT_FOUND.

Hello Ard,

thank you for providing the patch. Unfortunately this seems not to be enough for booting with an EFI_RNG_PROTOCOL.GetRng() returning EFI_UNSUPPORTED.

This is the output I received on v5.9-rc6, defconfig with your patch applied. I can retry with a branch from
https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git/ if you indicate which one to use.

EFI stub: Booting Linux Kernel...
EFI stub: ERROR: efi_get_random_bytes() failed (0x8000000000000003), KASLR will be disabled
EFI stub: Using DTB from configuration table

EFI stub: Exiting boot services and installing virtual address map...

EFI stub: ERROR: Unable to construct new device tree. EFI stub: ERROR: Failed to update FDT and exit boot services

This matches the problem originally reported by Scott.

Best regards

Heinrich

Quoted 23 lines
---
 drivers/firmware/efi/libstub/arm64-stub.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/firmware/efi/libstub/arm64-stub.c +3 -3
index e5bfac79e5ac..21692a986beb 100644
@@ -62,10 +62,10 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
 			status = efi_get_random_bytes(sizeof(phys_seed),
 						      (u8 *)&phys_seed);
 			if (status == EFI_NOT_FOUND) {
-				efi_info("EFI_RNG_PROTOCOL unavailable, no randomness supplied\n");
+				efi_info("EFI_RNG_PROTOCOL unavailable, KASLR will be disabled\n");
 			} else if (status != EFI_SUCCESS) {
-				efi_err("efi_get_random_bytes() failed\n");
-				return status;
+				efi_err("efi_get_random_bytes() failed (0x%lx), KASLR will be disabled\n",
+					status);
 			}
 		} else {
 			efi_info("KASLR disabled on kernel command line\n");
author maintainer
#2 lore raw
Quoted 30 lines · Heinrich Schuchardt
Quoted 11 lines · Ard Biesheuvel

Currently, on arm64, we abort on any failure from efi_get_random_bytes() other than EFI_NOT_FOUND when it comes to setting the physical seed for KASLR, but ignore such failures when obtaining the seed for virtual KASLR or for early seeding of the kernel's entropy pool via the config table. This is inconsistent, and may lead to unexpected boot failures.

So let's permit any failure for the physical seed, and simply report the error code if it does not equal EFI_NOT_FOUND.

Hello Ard,

thank you for providing the patch. Unfortunately this seems not to be enough for booting with an EFI_RNG_PROTOCOL.GetRng() returning EFI_UNSUPPORTED.

This is the output I received on v5.9-rc6, defconfig with your patch applied. I can retry with a branch from
https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git/ if you indicate which one to use.

EFI stub: Booting Linux Kernel...
EFI stub: ERROR: efi_get_random_bytes() failed (0x8000000000000003), KASLR will be disabled
EFI stub: Using DTB from configuration table

Quoted 7 lines

EFI stub: Exiting boot services and installing virtual address map...

EFI stub: ERROR: Unable to construct new device tree. EFI stub: ERROR: Failed to update FDT and exit boot services

This matches the problem originally reported by Scott.

OK, so we need something like the below as well:

drivers/firmware/efi/libstub/fdt.c +0 -0
@@ -145,8 +145,6 @@ static efi_status_t update_fdt(void *orig_fdt,

unsigned long orig_fdt_size,
status = fdt_setprop_var(fdt, node,

"kaslr-seed", fdt_val64);
                        if (status)
                                goto fdt_set_fail;
-               } else if (efi_status != EFI_NOT_FOUND) {
-                       return efi_status;
                }
        }

Could you please check whether that fixes the issue?

#3 lore raw
Quoted 55 lines · Ard Biesheuvel
Quoted 30 lines · Heinrich Schuchardt
Quoted 11 lines · Ard Biesheuvel

Currently, on arm64, we abort on any failure from efi_get_random_bytes() other than EFI_NOT_FOUND when it comes to setting the physical seed for KASLR, but ignore such failures when obtaining the seed for virtual KASLR or for early seeding of the kernel's entropy pool via the config table. This is inconsistent, and may lead to unexpected boot failures.

So let's permit any failure for the physical seed, and simply report the error code if it does not equal EFI_NOT_FOUND.

Hello Ard,

thank you for providing the patch. Unfortunately this seems not to be enough for booting with an EFI_RNG_PROTOCOL.GetRng() returning EFI_UNSUPPORTED.

This is the output I received on v5.9-rc6, defconfig with your patch applied. I can retry with a branch from
https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git/ if you indicate which one to use.

EFI stub: Booting Linux Kernel...
EFI stub: ERROR: efi_get_random_bytes() failed (0x8000000000000003), KASLR will be disabled
EFI stub: Using DTB from configuration table

Quoted 7 lines

EFI stub: Exiting boot services and installing virtual address map...

EFI stub: ERROR: Unable to construct new device tree. EFI stub: ERROR: Failed to update FDT and exit boot services

This matches the problem originally reported by Scott.

OK, so we need something like the below as well:

drivers/firmware/efi/libstub/fdt.c +0 -2
@@ -145,8 +145,6 @@ static efi_status_t update_fdt(void *orig_fdt,
 unsigned long orig_fdt_size,
                        status = fdt_setprop_var(fdt, node,
 "kaslr-seed", fdt_val64);
                        if (status)
                                goto fdt_set_fail;
-               } else if (efi_status != EFI_NOT_FOUND) {
-                       return efi_status;
                }
        }
Quoted 2 lines

Could you please check whether that fixes the issue?

The new change allows booting.

I could not observe the new message from the patch on my ARM64 system. The only related messages I found are:

[  +0.000000] efi: EFI v2.80 by Das U-Boot
[  +0.000000] efi: RTPROP=0x7aef9040 SMBIOS=0x7aef5000 MEMRESERVE=0x566df040
[  +0.000000] random: get_random_bytes called from

start_kernel+0x314/0x4e8 with crng_init=0
[ +0.003506] KASLR disabled due to lack of seed

Best regards

Heinrich

author maintainer
#4 lore raw
Quoted 62 lines · Heinrich Schuchardt
Quoted 55 lines · Ard Biesheuvel
Quoted 30 lines · Heinrich Schuchardt
Quoted 11 lines · Ard Biesheuvel

Currently, on arm64, we abort on any failure from efi_get_random_bytes() other than EFI_NOT_FOUND when it comes to setting the physical seed for KASLR, but ignore such failures when obtaining the seed for virtual KASLR or for early seeding of the kernel's entropy pool via the config table. This is inconsistent, and may lead to unexpected boot failures.

So let's permit any failure for the physical seed, and simply report the error code if it does not equal EFI_NOT_FOUND.

Hello Ard,

thank you for providing the patch. Unfortunately this seems not to be enough for booting with an EFI_RNG_PROTOCOL.GetRng() returning EFI_UNSUPPORTED.

This is the output I received on v5.9-rc6, defconfig with your patch applied. I can retry with a branch from
https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git/ if you indicate which one to use.

EFI stub: Booting Linux Kernel...
EFI stub: ERROR: efi_get_random_bytes() failed (0x8000000000000003), KASLR will be disabled
EFI stub: Using DTB from configuration table

Quoted 7 lines

EFI stub: Exiting boot services and installing virtual address map...

EFI stub: ERROR: Unable to construct new device tree. EFI stub: ERROR: Failed to update FDT and exit boot services

This matches the problem originally reported by Scott.

OK, so we need something like the below as well:

drivers/firmware/efi/libstub/fdt.c +0 -2
@@ -145,8 +145,6 @@ static efi_status_t update_fdt(void *orig_fdt,
 unsigned long orig_fdt_size,
                        status = fdt_setprop_var(fdt, node,
 "kaslr-seed", fdt_val64);
                        if (status)
                                goto fdt_set_fail;
-               } else if (efi_status != EFI_NOT_FOUND) {
-                       return efi_status;
                }
        }
Quoted 2 lines

Could you please check whether that fixes the issue?

The new change allows booting.

Quoted 9 lines

I could not observe the new message from the patch on my ARM64 system. The only related messages I found are:

[  +0.000000] efi: EFI v2.80 by Das U-Boot
[  +0.000000] efi: RTPROP=0x7aef9040 SMBIOS=0x7aef5000 MEMRESERVE=0x566df040
[  +0.000000] random: get_random_bytes called from

start_kernel+0x314/0x4e8 with crng_init=0
[ +0.003506] KASLR disabled due to lack of seed

Thanks. The EFI diagnostic messages are usually written directly to the serial console - they are not captured by dmesg.