dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-13 10:59:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Set secure_boot flag in Kernel Zero-Page (#7482)"

Browse Source 
This reverts commit b4f9f2a62f.

Revert this because a) the quiet bug is fixed in linux and b)
Documentation/boot.txt says "All other fields should be zero."
This commit is contained in:
Michael Niewöhner
2019-02-20 20:14:15 +01:00
parent 63eb09569a
commit 5f7df68c11
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/boot/efi/linux.c
View File

@@ -72,7 +72,7 @@ static VOID linux_efi_handover(EFI_HANDLE image, struct SetupHeader *setup) {
EFI_STATUS linux_exec(EFI_HANDLE *image,
CHAR8 *cmdline, UINTN cmdline_len,
UINTN linux_addr,
UINTN initrd_addr, UINTN initrd_size, BOOLEAN secure) {
UINTN initrd_addr, UINTN initrd_size) {
struct SetupHeader *image_setup;
struct SetupHeader *boot_setup;
EFI_PHYSICAL_ADDRESS addr;
@@ -95,17 +95,6 @@ EFI_STATUS linux_exec(EFI_HANDLE *image,
CopyMem(boot_setup, image_setup, sizeof(struct SetupHeader));
boot_setup->loader_id = 0xff;
if (secure) {
/* set secure boot flag in linux kernel zero page, see
- Documentation/x86/zero-page.txt
- arch/x86/include/uapi/asm/bootparam.h
- drivers/firmware/efi/libstub/secureboot.c
in the linux kernel source tree
Possible values: 0 (unassigned), 1 (undetected), 2 (disabled), 3 (enabled)
*/
boot_setup->boot_sector[0x1ec] = 3;
}
boot_setup->code32_start = (UINT32)linux_addr + (image_setup->setup_secs+1) * 512;
if (cmdline) {

2
src/boot/efi/linux.h
View File

@@ -4,4 +4,4 @@
EFI_STATUS linux_exec(EFI_HANDLE *image,
CHAR8 *cmdline, UINTN cmdline_size,
UINTN linux_addr,
UINTN initrd_addr, UINTN initrd_size, BOOLEAN secure);
UINTN initrd_addr, UINTN initrd_size);

2
src/boot/efi/stub.c
View File

@@ -124,7 +124,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
err = linux_exec(image, cmdline, cmdline_len,
(UINTN)loaded_image->ImageBase + addrs[1],
(UINTN)loaded_image->ImageBase + addrs[2], szs[2], secure);
(UINTN)loaded_image->ImageBase + addrs[2], szs[2]);
graphics_mode(FALSE);
Print(L"Execution of embedded linux image failed: %r\n", err);