From b5123d0553f4ed5e734f6457696cdd30228d1eee Mon Sep 17 00:00:00 2001

From: David Howells <dhowells@redhat.com>

Date: Tue, 27 Feb 2018 10:04:55 +0000

Subject: [PATCH 2/3] efi: Add an EFI_SECURE_BOOT flag to indicate secure

 boot mode

Patch-mainline: Never, Fedora Core 32

References: jsc#SLE-9870

UEFI machines can be booted in Secure Boot mode.  Add an EFI_SECURE_BOOT

flag that can be passed to efi_enabled() to find out whether secure boot is

enabled.

Move the switch-statement in x86's setup_arch() that inteprets the

secure_boot boot parameter to generic code and set the bit there.

Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Signed-off-by: David Howells <dhowells@redhat.com>

Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

cc: linux-efi@vger.kernel.org

[Rebased for context; efi_is_table_address was moved to arch/x86]

Signed-off-by: Jeremy Cline <jcline@redhat.com>

Acked-by: Lee, Chun-Yi <jlee@suse.com>

Signed-off-by: Chester Lin <clin@suse.com>

---

 arch/x86/kernel/setup.c           |   14 +-------------

 drivers/firmware/efi/Makefile     |    1 +

 drivers/firmware/efi/secureboot.c |   38 ++++++++++++++++++++++++++++++++++++++

 include/linux/efi.h               |   19 ++++++++++++-------

 4 files changed, 52 insertions(+), 20 deletions(-)

 create mode 100644 drivers/firmware/efi/secureboot.c

--- a/arch/x86/kernel/setup.c

+++ b/arch/x86/kernel/setup.c

@@ -1114,19 +1114,7 @@ void __init setup_arch(char **cmdline_p)

 	/* Allocate bigger log buffer */

 	setup_log_buf(1);

-	if (efi_enabled(EFI_BOOT)) {

-		switch (boot_params.secure_boot) {

-		case efi_secureboot_mode_disabled:

-			pr_info("Secure boot disabled\n");

-			break;

-		case efi_secureboot_mode_enabled:

-			pr_info("Secure boot enabled\n");

-			break;

-		default:

-			pr_info("Secure boot could not be determined\n");

-			break;

-		}

-	}

+	efi_set_secure_boot(boot_params.secure_boot);

 	reserve_initrd();

--- a/drivers/firmware/efi/Makefile

+++ b/drivers/firmware/efi/Makefile

@@ -27,6 +27,7 @@ obj-$(CONFIG_EFI_FAKE_MEMMAP)		+= fake_m

 obj-$(CONFIG_EFI_BOOTLOADER_CONTROL)	+= efibc.o

 obj-$(CONFIG_EFI_TEST)			+= test/

 obj-$(CONFIG_EFI_DEV_PATH_PARSER)	+= dev-path-parser.o

+obj-$(CONFIG_EFI)			+= secureboot.o

 obj-$(CONFIG_APPLE_PROPERTIES)		+= apple-properties.o

 obj-$(CONFIG_EFI_RCI2_TABLE)		+= rci2-table.o

 obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE)	+= embedded-firmware.o

--- /dev/null

+++ b/drivers/firmware/efi/secureboot.c

@@ -0,0 +1,38 @@

+/* Core kernel secure boot support.

+ *

+ * Copyright (C) 2017 Red Hat, Inc. All Rights Reserved.

+ * Written by David Howells (dhowells@redhat.com)

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public Licence

+ * as published by the Free Software Foundation; either version

+ * 2 of the Licence, or (at your option) any later version.

+ */

+

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+

+#include <linux/efi.h>

+#include <linux/kernel.h>

+#include <linux/printk.h>

+

+/*

+ * Decide what to do when UEFI secure boot mode is enabled.

+ */

+void __init efi_set_secure_boot(enum efi_secureboot_mode mode)

+{

+	if (efi_enabled(EFI_BOOT)) {

+		switch (mode) {

+		case efi_secureboot_mode_disabled:

+			pr_info("Secure boot disabled\n");

+			break;

+		case efi_secureboot_mode_enabled:

+			set_bit(EFI_SECURE_BOOT, &efi.flags);

+			pr_info("Secure boot enabled\n");

+			break;

+		default:

+			pr_warn("Secure boot could not be determined (mode %u)\n",

+				   mode);

+			break;

+		}

+	}

+}

--- a/include/linux/efi.h

+++ b/include/linux/efi.h

@@ -847,6 +847,14 @@ extern int __init efi_setup_pcdp_console

 #define EFI_MEM_ATTR		10	/* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */

 #define EFI_MEM_NO_SOFT_RESERVE	11	/* Is the kernel configured to ignore soft reservations? */

 #define EFI_PRESERVE_BS_REGIONS	12	/* Are EFI boot-services memory segments available? */

+#define EFI_SECURE_BOOT		13	/* Are we in Secure Boot mode? */

+

+enum efi_secureboot_mode {

+	efi_secureboot_mode_unset,

+	efi_secureboot_mode_unknown,

+	efi_secureboot_mode_disabled,

+	efi_secureboot_mode_enabled,

+};

 #ifdef CONFIG_EFI

 /*

@@ -871,6 +879,8 @@ static inline bool efi_rt_services_suppo

 	return (efi.runtime_supported_mask & mask) == mask;

 }

 extern void efi_find_mirror(void);

+

+extern void __init efi_set_secure_boot(enum efi_secureboot_mode mode);

 #else

 static inline bool efi_enabled(int feature)

 {

@@ -890,6 +900,8 @@ static inline bool efi_rt_services_suppo

 }

 static inline void efi_find_mirror(void) {}

+

+static inline void efi_set_secure_boot(enum efi_secureboot_mode mode) {}

 #endif

 extern int efi_status_to_err(efi_status_t status);

@@ -1105,13 +1117,6 @@ static inline bool efi_runtime_disabled(

 extern void efi_call_virt_check_flags(unsigned long flags, const char *call);

 extern unsigned long efi_call_virt_save_flags(void);

-enum efi_secureboot_mode {

-	efi_secureboot_mode_unset,

-	efi_secureboot_mode_unknown,

-	efi_secureboot_mode_disabled,

-	efi_secureboot_mode_enabled,

-};

-

 static inline

 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)

 {