diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-10-12 13:38:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-10-12 13:38:31 +0200 |
| commit | 4d0a4388ccdd9482fef6b26f879d0f6099143f80 (patch) | |
| tree | b711a02c0cf93d50ac206511e879b4d3521d12b7 /drivers/firmware/efi/libstub/arm64-stub.c | |
| parent | cc383a9e245c527d3175e2cf4cced9dbbedbbac6 (diff) | |
| parent | d32de9130f6c79533508e2c7879f18997bfbe2a0 (diff) | |
| download | linux-stable-4d0a4388ccdd9482fef6b26f879d0f6099143f80.tar.gz linux-stable-4d0a4388ccdd9482fef6b26f879d0f6099143f80.tar.bz2 linux-stable-4d0a4388ccdd9482fef6b26f879d0f6099143f80.zip | |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
These fixes missed the v5.9 merge window, pick them up for early v5.10 merge.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/libstub/arm64-stub.c')
| -rw-r--r-- | drivers/firmware/efi/libstub/arm64-stub.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c index 56e79f3ebd67..54b3327ef008 100644 --- a/drivers/firmware/efi/libstub/arm64-stub.c +++ b/drivers/firmware/efi/libstub/arm64-stub.c @@ -61,10 +61,12 @@ 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"); + efi_nokaslr = true; } 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); + efi_nokaslr = true; } } else { efi_info("KASLR disabled on kernel command line\n"); |