kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl/boot: Fix stage3 secure boot trailer placement

Browse Source 
The stage3 linker script places .sb.trailer so that it must end at
COMMAND_LINE_EXTRA. The current script derives the start address from
SIZEOF(.sb.trailer) before the section is emitted:

  . = COMMAND_LINE_EXTRA - SIZEOF(.sb.trailer);

With binutils older than 2.39 before commit 648f6099d4dc ("-z relro
relaxation and ld script SIZEOF") this can result in .sb.trailer being
placed at COMMAND_LINE_EXTRA instead, moving the trailer into the
following area and breaking the expected layout.

The trailer has a fixed size, so use an explicit constant for the
placement calculation and keep the ASSERT to verify the final section
size. This makes the placement deterministic again.

Fixes: a1126352ec ("zipl/boot: Improve linker scripts")
Reviewed-by: Marc Hartmayer <marc@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
Vasily Gorbik
2026-03-12 18:36:00 +01:00
committed by Jan Höppner
parent d0046257b6
commit 50f909db8f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zipl/boot/stage3.lds.S
View File

@@ -48,15 +48,16 @@ SECTIONS
.rodata : {*(.rodata .rodata.*) }
.data : { *(.data .data.*) }
#define SB_TRAILER_SIZE 32
/* Trailer needed for Secure Boot */
. = COMMAND_LINE_EXTRA - SIZEOF(.sb.trailer);
. = COMMAND_LINE_EXTRA - SB_TRAILER_SIZE;
.sb.trailer : {
QUAD(0x0000c00000000000)
QUAD(STAGE3_ENTRY + PSW_LOAD)
QUAD(STAGE3_ENTRY)
QUAD(0x000000207a49504c)
}
ASSERT(SIZEOF(.sb.trailer) == 32, "Invalid .sb.trailer size")
ASSERT(SIZEOF(.sb.trailer) == SB_TRAILER_SIZE, "Invalid .sb.trailer size")
. = COMMAND_LINE_EXTRA;
.cmdline_extra : {