hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/s390/boot/ipl_report.c
....@@ -57,11 +57,19 @@
5757 if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE &&
5858 intersects(INITRD_START, INITRD_SIZE, safe_addr, size))
5959 safe_addr = INITRD_START + INITRD_SIZE;
60
+ if (intersects(safe_addr, size, (unsigned long)comps, comps->len)) {
61
+ safe_addr = (unsigned long)comps + comps->len;
62
+ goto repeat;
63
+ }
6064 for_each_rb_entry(comp, comps)
6165 if (intersects(safe_addr, size, comp->addr, comp->len)) {
6266 safe_addr = comp->addr + comp->len;
6367 goto repeat;
6468 }
69
+ if (intersects(safe_addr, size, (unsigned long)certs, certs->len)) {
70
+ safe_addr = (unsigned long)certs + certs->len;
71
+ goto repeat;
72
+ }
6573 for_each_rb_entry(cert, certs)
6674 if (intersects(safe_addr, size, cert->addr, cert->len)) {
6775 safe_addr = cert->addr + cert->len;