s390/ipl: read IPL report at early boot

Read the IPL Report block provided by secure-boot, add the entries
of the certificate list to the system key ring and print the list
of components.

PR: Adjust to Vasilys bootdata_preserved patch set. Preserve ipl_cert_list
for later use in kexec_file.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Philipp Rudo <prudo@linux.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 64 insertions, 0 deletions

diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c
index f9718bc67cd4..0567de4005b4 100644
--- a/arch/s390/kernel/ipl.c
+++ b/arch/s390/kernel/ipl.c
@@ -122,6 +122,13 @@ static char *dump_type_str(enum dump_type type)
 
 int __bootdata_preserved(ipl_block_valid);
 struct ipl_parameter_block __bootdata_preserved(ipl_block);
+int __bootdata_preserved(ipl_secure_flag);
+
+unsigned long __bootdata_preserved(ipl_cert_list_addr);
+unsigned long __bootdata_preserved(ipl_cert_list_size);
+
+unsigned long __bootdata(early_ipl_comp_list_addr);
+unsigned long __bootdata(early_ipl_comp_list_size);
 
 static int reipl_capabilities = IPL_TYPE_UNKNOWN;
 
@@ -267,6 +274,15 @@ static ssize_t ipl_type_show(struct kobject *kobj, struct kobj_attribute *attr,
 
 static struct kobj_attribute sys_ipl_type_attr = __ATTR_RO(ipl_type);
 
+static ssize_t ipl_secure_show(struct kobject *kobj,
+                               struct kobj_attribute *attr, char *page)
+{
+        return sprintf(page, "%i\n", !!ipl_secure_flag);
+}
+
+static struct kobj_attribute sys_ipl_secure_attr =
+        __ATTR(secure, 0444, ipl_secure_show, NULL);
+
 static ssize_t ipl_vm_parm_show(struct kobject *kobj,
                                 struct kobj_attribute *attr, char *page)
 {
@@ -362,6 +378,7 @@ static struct attribute *ipl_fcp_attrs[] = {
         &sys_ipl_fcp_bootprog_attr.attr,
         &sys_ipl_fcp_br_lba_attr.attr,
         &sys_ipl_ccw_loadparm_attr.attr,
+        &sys_ipl_secure_attr.attr,
         NULL,
 };
 
@@ -377,6 +394,7 @@ static struct attribute *ipl_ccw_attrs_vm[] = {
         &sys_ipl_device_attr.attr,
         &sys_ipl_ccw_loadparm_attr.attr,
         &sys_ipl_vm_parm_attr.attr,
+        &sys_ipl_secure_attr.attr,
         NULL,
 };
 
@@ -384,6 +402,7 @@ static struct attribute *ipl_ccw_attrs_lpar[] = {
         &sys_ipl_type_attr.attr,
         &sys_ipl_device_attr.attr,
         &sys_ipl_ccw_loadparm_attr.attr,
+        &sys_ipl_secure_attr.attr,
         NULL,
 };
 
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
index 12d136e567c4..ffc87520aca9 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -50,6 +50,7 @@
 #include <linux/compat.h>
 #include <linux/start_kernel.h>
 
+#include <asm/boot_data.h>
 #include <asm/ipl.h>
 #include <asm/facility.h>
 #include <asm/smp.h>
@@ -741,6 +742,15 @@ static void __init reserve_initrd(void)
 #endif
 }
 
+/*
+ * Reserve the memory area used to pass the certificate lists
+ */
+static void __init reserve_certificate_list(void)
+{
+        if (ipl_cert_list_addr)
+                memblock_reserve(ipl_cert_list_addr, ipl_cert_list_size);
+}
+
 static void __init reserve_mem_detect_info(void)
 {
         unsigned long start, size;
@@ -1036,6 +1046,38 @@ static void __init setup_control_program_code(void)
 }
 
 /*
+ * Print the component list from the IPL report
+ */
+static void __init log_component_list(void)
+{
+        struct ipl_rb_component_entry *ptr, *end;
+        char *str;
+
+        if (!early_ipl_comp_list_addr)
+                return;
+        if (ipl_block.hdr.flags & IPL_PL_FLAG_IPLSR)
+                pr_info("Linux is running with Secure-IPL enabled\n");
+        else
+                pr_info("Linux is running with Secure-IPL disabled\n");
+        ptr = (void *) early_ipl_comp_list_addr;
+        end = (void *) ptr + early_ipl_comp_list_size;
+        pr_info("The IPL report contains the following components:\n");
+        while (ptr < end) {
+                if (ptr->flags & IPL_RB_COMPONENT_FLAG_SIGNED) {
+                        if (ptr->flags & IPL_RB_COMPONENT_FLAG_VERIFIED)
+                                str = "signed, verified";
+                        else
+                                str = "signed, verification failed";
+                } else {
+                        str = "not signed";
+                }
+                pr_info("%016llx - %016llx (%s)\n",
+                        ptr->addr, ptr->addr + ptr->len, str);
+                ptr++;
+        }
+}
+
+/*
  * Setup function called from init/main.c just after the banner
  * was printed.
  */
@@ -1055,6 +1097,8 @@ void __init setup_arch(char **cmdline_p)
         else
                 pr_info("Linux is running as a guest in 64-bit mode\n");
 
+        log_component_list();
+
         /* Have one command line that is parsed and saved in /proc/cmdline */
         /* boot_command_line has been already set up in early.c */
         *cmdline_p = boot_command_line;
@@ -1086,6 +1130,7 @@ void __init setup_arch(char **cmdline_p)
         reserve_oldmem();
         reserve_kernel();
         reserve_initrd();
+        reserve_certificate_list();
         reserve_mem_detect_info();
         memblock_allow_resize();