pc-bios/s390-ccw: Add additional security checks for secure boot
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. 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 <zycai@linux.ibm.com> Reviewed-by: Eric Farman <farman@linux.ibm.com> Reviewed-by: Collin Walling <walling@linux.ibm.com> Link: https://lore.kernel.org/qemu-devel/20260730214624.2328883-27-zycai@linux.ibm.com Signed-off-by: Eric Farman <farman@linux.ibm.com>
Zhuoying Cai committed
Jul 30, 2026 at 17:46 UTC
a8e4f5cb6147abbef4a3ac9a36d32e1a0706638f
4 files changed
+255
-5
include/hw/s390x/ipl/qipl.h
+27
-2
@@ -172,10 +172,20 @@ struct IplInfoReportBlockHeader {
172
};
173
typedef struct IplInfoReportBlockHeader IplInfoReportBlockHeader;
174
175
+/* IPL Info Error Indicators */
176
+#define S390_IIEI_NO_SIGNED_COMP 0x8000 /* bit 0 */
177
+#define S390_IIEI_NO_SCLAB 0x4000 /* bit 1 */
178
+#define S390_IIEI_NO_GLOBAL_SCLAB 0x2000 /* bit 2 */
179
+#define S390_IIEI_MORE_GLOBAL_SCLAB 0x1000 /* bit 3 */
180
+#define S390_IIEI_FOUND_UNSIGNED_COMP 0x800 /* bit 4 */
181
+#define S390_IIEI_MORE_SIGNED_COMP 0x400 /* bit 5 */
182
+
183
struct IplInfoBlockHeader {
184
uint32_t len;
185
uint8_t type;
178
- uint8_t reserved1[11];
186
+ uint8_t reserved1[3];
187
+ uint16_t iiei;
188
+ uint8_t reserved2[6];
189
};
190
typedef struct IplInfoBlockHeader IplInfoBlockHeader;
191
@@ -199,13 +209,28 @@ typedef struct IplSignatureCertificateList IplSignatureCertificateList;
209
#define S390_IPL_DEV_COMP_FLAG_SC 0x80
210
#define S390_IPL_DEV_COMP_FLAG_CSV 0x40
211
212
+/* IPL Device Component Error Indicators */
213
+#define S390_CEI_INVALID_SCLAB 0x80000000 /* bit 0 */
214
+#define S390_CEI_INVALID_SCLAB_LEN 0x40000000 /* bit 1 */
215
+#define S390_CEI_INVALID_SCLAB_FORMAT 0x20000000 /* bit 2 */
216
+#define S390_CEI_UNMATCHED_SCLAB_LOAD_ADDR 0x10000000 /* bit 3 */
217
+#define S390_CEI_UNMATCHED_SCLAB_LOAD_PSW 0x8000000 /* bit 4 */
218
+#define S390_CEI_INVALID_LOAD_PSW 0x4000000 /* bit 5 */
219
+#define S390_CEI_NUC_NOT_IN_GLOBAL_SCLAB 0x2000000 /* bit 6 */
220
+#define S390_CEI_SCLAB_OLA_NOT_ONE 0x1000000 /* bit 7 */
221
+#define S390_CEI_SC_NOT_IN_GLOBAL_SCLAB 0x800000 /* bit 8 */
222
+#define S390_CEI_SCLAB_LOAD_ADDR_NOT_ZERO 0x400000 /* bit 9 */
223
+#define S390_CEI_SCLAB_LOAD_PSW_NOT_ZERO 0x200000 /* bit 10 */
224
+#define S390_CEI_INVALID_UNSIGNED_ADDR 0x100000 /* bit 11 */
225
+
226
struct IplDeviceComponentEntry {
227
uint64_t addr;
228
uint64_t len;
229
uint8_t flags;
230
uint8_t reserved1[5];
231
uint16_t cert_index;
208
- uint8_t reserved2[8];
232
+ uint32_t cei;
233
+ uint8_t reserved2[4];
234
};
235
typedef struct IplDeviceComponentEntry IplDeviceComponentEntry;
236
pc-bios/s390-ccw/sclp.h
+1
@@ -52,6 +52,7 @@ typedef struct SCCBHeader {
52
#define SCCB_DATA_LEN (SCCB_SIZE - sizeof(SCCBHeader))
53
#define SCCB_FAC134_DIAG320_BIT 0x4
54
#define SCCB_FAC_IPL_SIPL_BIT 0x4000
55
+#define SCCB_FAC_IPL_SCLAF_BIT 0x1000
56
57
typedef struct ReadInfo {
58
SCCBHeader h;
pc-bios/s390-ccw/secure-ipl.c
+176
-3
@@ -180,6 +180,12 @@ bool secure_ipl_supported(void)
180
return false;
181
}
182
183
+ if (!sclp_is_fac_ipl_flag_on(SCCB_FAC_IPL_SCLAF_BIT)) {
184
+ puts("Secure IPL Code Loading Attributes Facility is not supported by"
185
+ " the hypervisor!");
186
+ return false;
187
+ }
188
+
189
return true;
190
}
191
@@ -210,6 +216,156 @@ static void check_comp_overlap(IplDeviceComponentList *comp_list,
216
}
217
}
218
219
+static bool is_psw_valid(uint64_t psw, IplDeviceComponentEntry *comp)
220
+{
221
+ uint32_t addr = psw & 0x7fffffff;
222
+
223
+ /*
224
+ * PSW points within a signed binary code component
225
+ *
226
+ * Check addr falls within [comp->addr, comp->addr + comp->len - 2],
227
+ * ensuring at least 2 bytes (minimum instruction length) remain.
228
+ */
229
+ return intersects(addr, 1, comp->addr, comp->len - 1);
230
+}
231
+
232
+void check_global_sclab(const SclaBlock *global_sclab,
233
+ IplDeviceComponentEntry *comp_entry,
234
+ IplDeviceComponentList *comp_list)
235
+{
236
+ bool psw_valid = false;
237
+ bool global_psw_valid = false;
238
+ int signed_count = 0;
239
+ int unsigned_count = 0;
240
+ IplDeviceComponentEntry *comp;
241
+
242
+ if (!global_sclab) {
243
+ comp_list->ipl_info_header.iiei |= S390_IIEI_NO_GLOBAL_SCLAB;
244
+ zipl_secure_error("Global SCLAB does not exist");
245
+ return;
246
+ }
247
+
248
+ for_each_rb_entry(comp, comp_list) {
249
+ if (comp->flags & S390_IPL_DEV_COMP_FLAG_SC) {
250
+ psw_valid |= is_psw_valid(comp_entry->addr, comp);
251
+ global_psw_valid |= is_psw_valid(global_sclab->load_psw, comp);
252
+ signed_count += 1;
253
+ } else {
254
+ unsigned_count += 1;
255
+ }
256
+ }
257
+
258
+ /* validate load PSW with PSW specified in the final entry */
259
+ zipl_secure_validate(psw_valid && global_psw_valid, &comp_entry->cei,
260
+ S390_CEI_INVALID_LOAD_PSW, "Invalid PSW");
261
+
262
+ /* compare load PSW with the PSW specified in component */
263
+ zipl_secure_validate(global_sclab->load_psw == comp_entry->addr,
264
+ &comp_entry->cei, S390_CEI_UNMATCHED_SCLAB_LOAD_PSW,
265
+ "Load PSW does not match with PSW in component");
266
+
267
+ /* Unsigned components are not allowed if NUC flag is set in the global SCLAB */
268
+ if ((global_sclab->flags & S390_SCLAB_NUC) && unsigned_count > 0) {
269
+ comp_list->ipl_info_header.iiei |= S390_IIEI_FOUND_UNSIGNED_COMP;
270
+ zipl_secure_error("Unsigned components are not allowed");
271
+ }
272
+
273
+ /*
274
+ * Only one signed component is allowed if SC flag is set in the global SCLAB
275
+ * More than one component in the component table is not allowed
276
+ */
277
+ if ((global_sclab->flags & S390_SCLAB_SC) &&
278
+ (signed_count != 1 || unsigned_count != 0)) {
279
+ comp_list->ipl_info_header.iiei |= S390_IIEI_MORE_SIGNED_COMP;
280
+ zipl_secure_error("Only one signed component is allowed");
281
+ }
282
+}
283
+
284
+static void check_sclab(SclaBlock **global_sclab,
285
+ IplDeviceComponentEntry *comp_entry,
286
+ IplInfoBlockHeader *comp_list_hdr)
287
+{
288
+ SclabOriginLocator *sclab_locator;
289
+ SclaBlock *sclab;
290
+
291
+ /* must be large enough to locate the sclab locator, else implies invalid SCLAB */
292
+ zipl_secure_validate(comp_entry->len >= 8, &comp_entry->cei,
293
+ S390_CEI_INVALID_SCLAB,
294
+ "Signed component too short to contain SCLAB locator");
295
+
296
+ if (comp_entry->cei & S390_CEI_INVALID_SCLAB) {
297
+ return;
298
+ }
299
+
300
+ /* sclab locator is located at the last 8 bytes of the signed comp */
301
+ sclab_locator = (SclabOriginLocator *)(comp_entry->addr +
302
+ comp_entry->len - 8);
303
+
304
+ /* return early if sclab does not exist */
305
+ zipl_secure_validate(magic_match(sclab_locator->magic, ZIPL_MAGIC),
306
+ &comp_entry->cei, S390_CEI_INVALID_SCLAB,
307
+ "Magic does not match. SCLAB does not exist");
308
+
309
+ if (comp_entry->cei & S390_CEI_INVALID_SCLAB) {
310
+ return;
311
+ }
312
+
313
+ zipl_secure_validate(sclab_locator->len >= S390_SCLAB_MIN_LEN, &comp_entry->cei,
314
+ S390_CEI_INVALID_SCLAB_LEN | S390_CEI_INVALID_SCLAB,
315
+ "Invalid SCLAB length");
316
+
317
+ /* return early if sclab is invalid */
318
+ if (comp_entry->cei & S390_CEI_INVALID_SCLAB) {
319
+ return;
320
+ }
321
+
322
+ sclab = (SclaBlock *)(comp_entry->addr + comp_entry->len -
323
+ sclab_locator->len);
324
+
325
+ zipl_secure_validate(sclab->format == 0, &comp_entry->cei,
326
+ S390_CEI_INVALID_SCLAB_FORMAT,
327
+ "Format-0 SCLAB is not being used");
328
+
329
+ if (!(sclab->flags & S390_SCLAB_OPSW)) {
330
+ /* OPSW = 0 - Load PSW field in SCLAB must contain zeros */
331
+ zipl_secure_validate(sclab->load_psw == 0, &comp_entry->cei,
332
+ S390_CEI_SCLAB_LOAD_PSW_NOT_ZERO,
333
+ "Load PSW is not zero when Override PSW bit is zero");
334
+ } else {
335
+ /* OPSW = 1 indicating global SCLAB */
336
+ if (*global_sclab) {
337
+ comp_list_hdr->iiei |= S390_IIEI_MORE_GLOBAL_SCLAB;
338
+ zipl_secure_error("More than one global SCLAB");
339
+ }
340
+ *global_sclab = sclab;
341
+
342
+ /* override load address flag must set to one */
343
+ zipl_secure_validate(sclab->flags & S390_SCLAB_OLA, &comp_entry->cei,
344
+ S390_CEI_SCLAB_OLA_NOT_ONE,
345
+ "OLA flag is not set to one in the global SCLAB");
346
+ }
347
+
348
+ if (!(sclab->flags & S390_SCLAB_OLA)) {
349
+ /* OLA = 0 - Load address field in SCLAB must contain zeros */
350
+ zipl_secure_validate(sclab->load_addr == 0, &comp_entry->cei,
351
+ S390_CEI_SCLAB_LOAD_ADDR_NOT_ZERO,
352
+ "Load Address is not zero when OLA flag is zero");
353
+ } else {
354
+ /* OLA = 1 - Load address field must match storage address of the component */
355
+ zipl_secure_validate(sclab->load_addr == comp_entry->addr, &comp_entry->cei,
356
+ S390_CEI_UNMATCHED_SCLAB_LOAD_ADDR,
357
+ "Load Address does not match with component load address");
358
+ }
359
+
360
+ zipl_secure_validate(~sclab->flags & S390_SCLAB_NUC || sclab->flags & S390_SCLAB_OPSW,
361
+ &comp_entry->cei, S390_CEI_NUC_NOT_IN_GLOBAL_SCLAB,
362
+ "NUC bit is set, but not in the global SCLAB");
363
+
364
+ zipl_secure_validate(~sclab->flags & S390_SCLAB_SC || sclab->flags & S390_SCLAB_OPSW,
365
+ &comp_entry->cei, S390_CEI_SC_NOT_IN_GLOBAL_SCLAB,
366
+ "SC bit is set, but not in the global SCLAB");
367
+}
368
+
369
static int zipl_load_signature(ComponentEntry *entry, uint64_t sig)
370
{
371
if (entry->compdat.sig_info.format != DER_SIGNATURE_FORMAT) {
@@ -275,6 +431,8 @@ int zipl_run_secure(ComponentEntry **entry_ptr, const uint8_t *tmp_sec,
431
uint8_t *tmp_buf;
432
bool verified;
433
bool signed_found = false;
434
+ bool sclab_found = false;
435
+ SclaBlock *global_sclab = NULL;
436
437
if ((MAX_SIGNED_COMP * CERT_BUF_MAX_LEN) > CERT_BUF_SIZE) {
438
panic("Not enough memory to store certificates");
@@ -315,6 +473,10 @@ int zipl_run_secure(ComponentEntry **entry_ptr, const uint8_t *tmp_sec,
473
474
/* no signature present (unsigned component) */
475
if (!sig_entry.len) {
476
+ zipl_secure_validate(comp_entry.addr >= S390_UNSIGNED_MIN_ADDR,
477
+ &comp_entry.cei, S390_CEI_INVALID_UNSIGNED_ADDR,
478
+ "Load address for unsigned component is less than 0x2000");
479
+
480
comp_list_add(comp_list, comp_entry);
481
break;
482
}
@@ -326,6 +488,9 @@ int zipl_run_secure(ComponentEntry **entry_ptr, const uint8_t *tmp_sec,
488
comp_entry.flags = S390_IPL_DEV_COMP_FLAG_SC;
489
signed_found = true;
490
491
+ check_sclab(&global_sclab, &comp_entry, &comp_list->ipl_info_header);
492
+ sclab_found |= !(comp_entry.cei & S390_CEI_INVALID_SCLAB);
493
+
494
cert_entry = (IplSignatureCertificateEntry) { 0 };
495
verified = verify_signature(comp_entry, sig_entry,
496
&cert_entry.len, &cert_table_idx);
@@ -371,9 +536,17 @@ int zipl_run_secure(ComponentEntry **entry_ptr, const uint8_t *tmp_sec,
536
}
537
}
538
374
- if (!signed_found) {
375
- zipl_secure_error("Secure boot is on, but components are not signed");
376
- }
539
+ zipl_secure_validate(signed_found, &comp_list->ipl_info_header.iiei,
540
+ S390_IIEI_NO_SIGNED_COMP,
541
+ "Secure boot is on, but components are not signed");
542
+
543
+ zipl_secure_validate(sclab_found, &comp_list->ipl_info_header.iiei,
544
+ S390_IIEI_NO_SCLAB, "No recognizable SCLAB");
545
+
546
+ comp_entry = (IplDeviceComponentEntry){ 0 };
547
+ comp_entry.addr = entry->compdat.load_psw;
548
+ check_global_sclab(global_sclab, &comp_entry, comp_list);
549
+ comp_list_add(comp_list, comp_entry);
550
551
*entry_ptr = entry;
552
free((void *)sig_entry.addr);
pc-bios/s390-ccw/secure-ipl.h
+51
@@ -26,6 +26,33 @@ int zipl_run_secure(ComponentEntry **entry_ptr, const uint8_t *tmp_sec,
26
IplSignatureCertificateList *cert_list,
27
uint8_t **tmp_cert_buf);
28
29
+#define S390_SCLAB_OPSW 0x8000 /* override PSW flag */
30
+#define S390_SCLAB_OLA 0x4000 /* override load address flag */
31
+#define S390_SCLAB_NUC 0x2000 /* no unsigned components flag */
32
+#define S390_SCLAB_SC 0x1000 /* single component flag */
33
+
34
+#define S390_SCLAB_MIN_LEN 32
35
+#define S390_UNSIGNED_MIN_ADDR 0x2000
36
+
37
+/* Secure Code Loading Attributes Block */
38
+struct SclaBlock {
39
+ uint8_t format;
40
+ uint8_t reserved1;
41
+ uint16_t flags;
42
+ uint8_t reserved2[4];
43
+ uint64_t load_psw;
44
+ uint64_t load_addr;
45
+ uint64_t reserved3[];
46
+} __attribute__ ((packed));
47
+typedef struct SclaBlock SclaBlock;
48
+
49
+struct SclabOriginLocator {
50
+ uint8_t reserved[2];
51
+ uint16_t len;
52
+ uint8_t magic[4];
53
+} __attribute__ ((packed));
54
+typedef struct SclabOriginLocator SclabOriginLocator;
55
+
56
static inline void zipl_secure_error(const char *message)
57
{
58
switch (boot_mode) {
@@ -41,6 +68,30 @@ static inline void zipl_secure_error(const char *message)
68
}
69
}
70
71
+static inline void zipl_secure_validate_u16(bool condition, uint16_t *flags,
72
+ uint16_t flag, const char *message)
73
+{
74
+ if (!condition) {
75
+ *flags |= flag;
76
+ zipl_secure_error(message);
77
+ }
78
+}
79
+
80
+static inline void zipl_secure_validate_u32(bool condition, uint32_t *flags,
81
+ uint32_t flag, const char *message)
82
+{
83
+ if (!condition) {
84
+ *flags |= flag;
85
+ zipl_secure_error(message);
86
+ }
87
+}
88
+
89
+#define zipl_secure_validate(condition, flags, flag, message) \
90
+ _Generic((flags), \
91
+ uint16_t * : zipl_secure_validate_u16, \
92
+ uint32_t * : zipl_secure_validate_u32 \
93
+ )(condition, flags, flag, message)
94
+
95
static inline uint64_t _diag320(void *data, unsigned long subcode)
96
{
97
register unsigned long addr asm("0") = (unsigned long)data;