Merge branch 'arm64-lockdown-fix-sid' into 'sid'
arm64: lockdown: Move init_lockdown() call after efi_init() See merge request kernel-team/linux!129
This commit is contained in:
commit
3710d23ad8
|
@ -24,6 +24,9 @@ linux (4.19.20-2) UNRELEASED; urgency=medium
|
||||||
is enabled on Orange Pi Plus.
|
is enabled on Orange Pi Plus.
|
||||||
* [armhf] Enable REGULATOR_SY8106A as module.
|
* [armhf] Enable REGULATOR_SY8106A as module.
|
||||||
|
|
||||||
|
[ dann frazier ]
|
||||||
|
* arm64: lockdown: Move init_lockdown() call after uefi_init()
|
||||||
|
|
||||||
-- Ben Hutchings <ben@decadent.org.uk> Tue, 12 Feb 2019 12:49:10 +0000
|
-- Ben Hutchings <ben@decadent.org.uk> Tue, 12 Feb 2019 12:49:10 +0000
|
||||||
|
|
||||||
linux (4.19.20-1) unstable; urgency=medium
|
linux (4.19.20-1) unstable; urgency=medium
|
||||||
|
|
|
@ -19,6 +19,7 @@ Signed-off-by: Linn Crosetto <linn@hpe.com>
|
||||||
efi_set_secure_boot() in main kernel
|
efi_set_secure_boot() in main kernel
|
||||||
- Use lockdown API and naming]
|
- Use lockdown API and naming]
|
||||||
[bwh: Forward-ported to 4.19.3: adjust context in update_fdt()]
|
[bwh: Forward-ported to 4.19.3: adjust context in update_fdt()]
|
||||||
|
[dannf: Moved init_lockdown() call after uefi_init(), fixing SB detection]
|
||||||
---
|
---
|
||||||
arch/arm64/Kconfig | 13 +++++++++++++
|
arch/arm64/Kconfig | 13 +++++++++++++
|
||||||
drivers/firmware/efi/arm-init.c | 7 +++++++
|
drivers/firmware/efi/arm-init.c | 7 +++++++
|
||||||
|
@ -39,16 +40,16 @@ Signed-off-by: Linn Crosetto <linn@hpe.com>
|
||||||
|
|
||||||
#include <asm/efi.h>
|
#include <asm/efi.h>
|
||||||
|
|
||||||
@@ -252,6 +253,9 @@ void __init efi_init(void)
|
@@ -257,6 +258,9 @@ void __init efi_init(void)
|
||||||
"Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
|
return;
|
||||||
efi.memmap.desc_version);
|
}
|
||||||
|
|
||||||
+ efi_set_secure_boot(params.secure_boot);
|
+ efi_set_secure_boot(params.secure_boot);
|
||||||
+ init_lockdown();
|
+ init_lockdown();
|
||||||
+
|
+
|
||||||
if (uefi_init() < 0) {
|
reserve_regions();
|
||||||
efi_memmap_unmap();
|
efi_esrt_init();
|
||||||
return;
|
|
||||||
--- a/drivers/firmware/efi/efi.c
|
--- a/drivers/firmware/efi/efi.c
|
||||||
+++ b/drivers/firmware/efi/efi.c
|
+++ b/drivers/firmware/efi/efi.c
|
||||||
@@ -657,7 +657,8 @@ static __initdata struct params fdt_para
|
@@ -657,7 +657,8 @@ static __initdata struct params fdt_para
|
||||||
|
|
Loading…
Reference in New Issue