Skip to contentSkip to conversation

FAILED: patch "[PATCH] s390/boot: add secure boot trailer" failed to apply to 5.10-stable tree

PATCH [email protected] 1 participant 1 message Oct 31, 2022

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

aa127a069ef3 ("s390/boot: add secure boot trailer")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From aa127a069ef312aca02b730d5137e1778d0c3ba7 Mon Sep 17 00:00:00 2001
From: Peter Oberparleiter <[email protected]>
Date: Fri, 16 Sep 2022 15:01:36 +0200
Subject: [PATCH] s390/boot: add secure boot trailer

This patch enhances the kernel image adding a trailer as required for secure boot by future firmware versions.

arch/s390/boot/vmlinux.lds.S +11 -2
index af5c6860e0a1..fa9d33b01b85 100644
@@ -102,8 +102,17 @@ SECTIONS
 		_compressed_start = .;
 		*(.vmlinux.bin.compressed)
 		_compressed_end = .;
-		FILL(0xff);
-		. = ALIGN(4096);
+	}
+
+#define SB_TRAILER_SIZE 32
+	/* Trailer needed for Secure Boot */
+	. += SB_TRAILER_SIZE; /* make sure .sb.trailer does not overwrite the previous section */
+	. = ALIGN(4096) - SB_TRAILER_SIZE;
+	.sb.trailer : {
+		QUAD(0)
+		QUAD(0)
+		QUAD(0)
+		QUAD(0x000000207a49504c)
 	}
 	_end = .;