s390/boot/vmlinux.lds.S: Ensure bzImage ends with SecureBoot trailer

Since commit 3e86e4d74c04 ("kbuild: keep .modinfo section in
vmlinux.unstripped") the .modinfo section which has SHF_ALLOC ends up
in bzImage after the SecureBoot trailer. This breaks SecureBoot because
the bootloader can no longer find the SecureBoot trailer with kernel's
signature at the expected location in bzImage. To fix the bug,
move discarded sections before the ELF_DETAILS macro and discard
the .modinfo section which is not needed by the decompressor.

Fixes: 3e86e4d74c04 ("kbuild: keep .modinfo section in vmlinux.unstripped")
Cc: stable@vger.kernel.org
Suggested-by: Vasily Gorbik <gor@linux.ibm.com>
Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Tested-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/boot/vmlinux.lds.S b/arch/s390/boot/vmlinux.lds.S
index 50988022f9ea329e20f98dab44e6de4f2ac16e5a..070bc18babd0ea6c2c4bbd370440a62c432cc99b 100644 (file)
--- a/arch/s390/boot/vmlinux.lds.S
+++ b/arch/s390/boot/vmlinux.lds.S
@@ -137,6 +137,15 @@ SECTIONS
        }
        _end = .;
 
+       /* Sections to be discarded */
+       /DISCARD/ : {
+               COMMON_DISCARDS
+               *(.eh_frame)
+               *(*__ksymtab*)
+               *(___kcrctab*)
+               *(.modinfo)
+       }
+
        DWARF_DEBUG
        ELF_DETAILS
 
@@ -161,12 +170,4 @@ SECTIONS
                *(.rela.*) *(.rela_*)
        }
        ASSERT(SIZEOF(.rela.dyn) == 0, "Unexpected run-time relocations (.rela) detected!")
-
-       /* Sections to be discarded */
-       /DISCARD/ : {
-               COMMON_DISCARDS
-               *(.eh_frame)
-               *(*__ksymtab*)
-               *(___kcrctab*)
-       }
 }