On 12/02/2026 21.43, Zhuoying Cai wrote:
Add additional checks to ensure that components do not overlap with
signed components when loaded into memory.
Add additional checks to ensure the load addresses of unsigned components
are greater than or equal to 0x2000.
When the secure IPL code loading attributes facility (SCLAF) is installed,
all signed components must contain a secure code loading attributes block
(SCLAB).
The SCLAB provides further validation of information on where to load the
signed binary code from the load device, and where to start the execution
of the loaded OS code.
When SCLAF is installed, its content must be evaluated during secure IPL.
However, a missing SCLAB will not be reported in audit mode. The SCALB
checking will be skipped in this case.
Add IPL Information Error Indicators (IIEI) and Component Error
Indicators (CEI) for IPL Information Report Block (IIRB).
When SCLAF is installed, additional secure boot checks are performed
during zipl and store results of verification into IIRB.
Signed-off-by: Zhuoying Cai <[email protected]>
---
include/hw/s390x/ipl/qipl.h | 29 +++-
pc-bios/s390-ccw/s390-ccw.h | 1 +
pc-bios/s390-ccw/sclp.c | 8 +
pc-bios/s390-ccw/sclp.h | 1 +
pc-bios/s390-ccw/secure-ipl.c | 318 +++++++++++++++++++++++++++++++++-
pc-bios/s390-ccw/secure-ipl.h | 42 +++++
6 files changed, 395 insertions(+), 4 deletions(-)
...
diff --git a/pc-bios/s390-ccw/sclp.h b/pc-bios/s390-ccw/sclp.h
index cf147f4634..3441020d6b 100644
--- a/pc-bios/s390-ccw/sclp.h
+++ b/pc-bios/s390-ccw/sclp.h
@@ -52,6 +52,7 @@ typedef struct SCCBHeader {
#define SCCB_DATA_LEN (SCCB_SIZE - sizeof(SCCBHeader))
#define SCCB_FAC134_DIAG320_BIT 0x4
#define SCCB_FAC_IPL_SIPL_BIT 0x4000
+#define SCCB_FAC_IPL_SCLAF_BIT 0x1000
typedef struct ReadInfo {
SCCBHeader h;
diff --git a/pc-bios/s390-ccw/secure-ipl.c b/pc-bios/s390-ccw/secure-ipl.c
index 27d2833642..54e41ec11c 100644
--- a/pc-bios/s390-ccw/secure-ipl.c
+++ b/pc-bios/s390-ccw/secure-ipl.c
@@ -197,6 +197,12 @@ static bool secure_ipl_supported(void)
return false;
}
+ if (!sclp_is_sclaf_on()) {
+ puts("Secure IPL Code Loading Attributes Facility is not supported by"
+ " the hypervisor!");
+ return false;
+ }
Let me double-check: This emits a warning and then the bios might continue
with the boot process with another device? (zipl_load() prints another
warning and returns without panic'ing when ipl_scsi() failed)
... is this what we want? Or should the boot process be stopped in case
we're running in (non-audit) secure mode?
return true;
}
@@ -259,6 +265,290 @@ static void addr_overlap_check(SecureIplCompAddrRange *comp_addr_range,
*addr_range_index += 1;
}
+static void check_unsigned_addr(uint64_t load_addr, IplDeviceComponentEntry *comp_entry)
+{
+ /* unsigned load address must be greater than or equal to 0x2000 */
+ if (load_addr >= 0x2000) {
+ return;
+ }
+
+ set_comp_cei_with_log(comp_entry, S390_CEI_INVALID_UNSIGNED_ADDR,
+ "Load address is less than 0x2000");
+}
+
+static bool check_sclab_presence(uint8_t *sclab_magic,
+ IplDeviceComponentEntry *comp_entry)
+{
+ /* identifies the presence of SCLAB */
+ if (magic_match(sclab_magic, ZIPL_MAGIC)) {
+ return true;
+ }
+
+ if (comp_entry) {
+ comp_entry->cei |= S390_CEI_INVALID_SCLAB;
+ }
+
+ /* a missing SCLAB will not be reported in audit mode */
+ return false;
+}
+
+static void check_sclab_length(uint16_t sclab_len, IplDeviceComponentEntry
*comp_entry)
+{
+ if (sclab_len >= S390_SECURE_IPL_SCLAB_MIN_LEN) {
+ return;
+ }
+
+ set_comp_cei_with_log(comp_entry,
+ S390_CEI_INVALID_SCLAB_LEN | S390_CEI_INVALID_SCLAB,
+ "Invalid SCLAB length");
+}
+
+static void check_sclab_format(uint8_t sclab_format, IplDeviceComponentEntry
*comp_entry)
+{
+ /* SCLAB format must set to zero, indicating a format-0 SCLAB being used */
+ if (sclab_format == 0) {
+ return;
+ }
+
+ set_comp_cei_with_log(comp_entry, S390_CEI_INVALID_SCLAB_FORMAT,
+ "Format-0 SCLAB is not being used");
+}
+
+static void check_sclab_opsw(SecureCodeLoadingAttributesBlock *sclab,
+ SecureIplSclabInfo *sclab_info,
+ IplDeviceComponentEntry *comp_entry)
+{
+ const char *msg;
+ uint32_t cei_flag = 0;
+
+ if (!(sclab->flags & S390_SECURE_IPL_SCLAB_FLAG_OPSW)) {
+ /* OPSW = 0 - Load PSW field in SCLAB must contain zeros */
+ if (sclab->load_psw != 0) {
+ cei_flag |= S390_CEI_SCLAB_LOAD_PSW_NOT_ZERO;
+ msg = "Load PSW is not zero when Override PSW bit is zero";
+ }
+ } else {
+ /* OPSW = 1 indicating global SCLAB */
+ sclab_info->global_count += 1;
+ if (sclab_info->global_count == 1) {
+ sclab_info->load_psw = sclab->load_psw;
+ sclab_info->flags = sclab->flags;
+ }
+
+ /* OLA must set to one */
+ if (!(sclab->flags & S390_SECURE_IPL_SCLAB_FLAG_OLA)) {
+ cei_flag |= S390_CEI_SCLAB_OLA_NOT_ONE;
+ msg = "Override Load Address bit is not set to one in the global
SCLAB";
+ }
+ }
+
+ if (!cei_flag) {
+ return;
+ }
+
+ set_comp_cei_with_log(comp_entry, cei_flag, msg);
Code gets slightly shorter if you inverse the logic here:
if (cei_flag) {
set_comp_cei_with_log(comp_entry, cei_flag, msg);
}
+}
+
+static void check_sclab_ola(SecureCodeLoadingAttributesBlock *sclab, uint64_t
load_addr,
+ IplDeviceComponentEntry *comp_entry)
+{
+ const char *msg;
+ uint32_t cei_flag = 0;
+
+ if (!(sclab->flags & S390_SECURE_IPL_SCLAB_FLAG_OLA)) {
+ /* OLA = 0 - Load address field in SCLAB must contain zeros */
+ if (sclab->load_addr != 0) {
+ cei_flag |= S390_CEI_SCLAB_LOAD_ADDR_NOT_ZERO;
+ msg = "Load Address is not zero when Override Load Address bit is
zero";
+ }
+ } else {
+ /* OLA = 1 - Load address field must match storage address of the
component */
+ if (sclab->load_addr != load_addr) {
+ cei_flag |= S390_CEI_UNMATCHED_SCLAB_LOAD_ADDR;
+ msg = "Load Address does not match with component load address";
+ }
+ }
+
+ if (!cei_flag) {
+ return;
+ }
+
+ set_comp_cei_with_log(comp_entry, cei_flag, msg);
dito
Thomas
