This is a note to let you know that I've just added the patch titled
s390/boot: add secure boot trailer
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
s390-boot-add-secure-boot-trailer.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From aa127a069ef312aca02b730d5137e1778d0c3ba7 Mon Sep 17 00:00:00 2001
From: Peter Oberparleiter <oberpar@xxxxxxxxxxxxx>
Date: Fri, 16 Sep 2022 15:01:36 +0200
Subject: s390/boot: add secure boot trailer
From: Peter Oberparleiter <oberpar@xxxxxxxxxxxxx>
commit aa127a069ef312aca02b730d5137e1778d0c3ba7 upstream.
This patch enhances the kernel image adding a trailer as required for
secure boot by future firmware versions.
Cc: <stable@xxxxxxxxxxxxxxx> # 5.2+
Signed-off-by: Peter Oberparleiter <oberpar@xxxxxxxxxxxxx>
Reviewed-by: Sven Schnelle <svens@xxxxxxxxxxxxx>
Signed-off-by: Vasily Gorbik <gor@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/s390/boot/vmlinux.lds.S | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
--- a/arch/s390/boot/vmlinux.lds.S
+++ b/arch/s390/boot/vmlinux.lds.S
@@ -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 = .;
Patches currently in stable-queue which might be from oberpar@xxxxxxxxxxxxx are
queue-6.0/s390-cio-fix-out-of-bounds-access-on-cio_ignore-free.patch
queue-6.0/s390-boot-add-secure-boot-trailer.patch
