kbuild: Split .modinfo out from ELF_DETAILS

Commit 3e86e4d74c ("kbuild: keep .modinfo section in vmlinux.unstripped") added .modinfo to ELF_DETAILS while removing it from COMMON_DISCARDS, as it was needed in vmlinux.unstripped and ELF_DETAILS was present in all architecture specific vmlinux linker scripts. While this shuffle is fine for vmlinux, ELF_DETAILS and COMMON_DISCARDS may be used by other linker scripts, such as the s390 and x86 compressed boot images, which may not expect to have a .modinfo section. In certain circumstances, this could result in a bootloader failing to load the compressed kernel [1]. Commit ddc6cbef3e ("s390/boot/vmlinux.lds.S: Ensure bzImage ends with SecureBoot trailer") recently addressed this for the s390 bzImage but the same bug remains for arm, parisc, and x86. The presence of .modinfo in the x86 bzImage was the root cause of the issue worked around with commit d50f210913 ("kbuild: align modinfo section for Secureboot Authenticode EDK2 compat"). misc.c in arch/x86/boot/compressed includes lib/decompress_unzstd.c, which in turn includes lib/xxhash.c and its MODULE_LICENSE / MODULE_DESCRIPTION macros due to the STATIC definition. Split .modinfo out from ELF_DETAILS into its own macro and handle it in all vmlinux linker scripts. Discard .modinfo in the places where it was previously being discarded from being in COMMON_DISCARDS, as it has never been necessary in those uses. Cc: stable@vger.kernel.org Fixes: 3e86e4d74c ("kbuild: keep .modinfo section in vmlinux.unstripped") Reported-by: Ed W <lists@wildgooses.com> Closes: https://lore.kernel.org/587f25e0-a80e-46a5-9f01-87cb40cfa377@wildgooses.com/ [1] Tested-by: Ed W <lists@wildgooses.com> # x86_64 Link: https://patch.msgid.link/20260225-separate-modinfo-from-elf-details-v1-1-387ced6baf4b@kernel.org Signed-off-by: Nathan Chancellor <nathan@kernel.org>
2026-03-08 01:04:41 +01:00 · 2026-02-25 15:02:51 -07:00 · 2026-02-25 15:02:51 -07:00 · 8678591b47
commit 8678591b47
parent 6de23f81a5
27 changed files with 29 additions and 2 deletions
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@ -71,6 +71,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@ -123,6 +123,7 @@ SECTIONS
 	_end = . ;

 	STABS_DEBUG
+	MODINFO
 	ELF_DETAILS
 	DISCARDS

--- a/arch/arm/boot/compressed/vmlinux.lds.S
+++ b/arch/arm/boot/compressed/vmlinux.lds.S
@ -21,6 +21,7 @@ SECTIONS
    COMMON_DISCARDS
    *(.ARM.exidx*)
    *(.ARM.extab*)
+    *(.modinfo)
    *(.note.*)
    *(.rel.*)
    *(.printk_index)
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@ -154,6 +154,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ARM_DETAILS

 	ARM_ASSERTS
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@ -153,6 +153,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ARM_DETAILS

 	ARM_ASSERTS
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@ -349,6 +349,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	HEAD_SYMBOLS
--- a/arch/csky/kernel/vmlinux.lds.S
+++ b/arch/csky/kernel/vmlinux.lds.S
@ -109,6 +109,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/hexagon/kernel/vmlinux.lds.S
+++ b/arch/hexagon/kernel/vmlinux.lds.S
@ -62,6 +62,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS
 	.hexagon.attributes 0 : { *(.hexagon.attributes) }

--- a/arch/loongarch/kernel/vmlinux.lds.S
+++ b/arch/loongarch/kernel/vmlinux.lds.S
@ -147,6 +147,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 #ifdef CONFIG_EFI_STUB
--- a/arch/m68k/kernel/vmlinux-nommu.lds
+++ b/arch/m68k/kernel/vmlinux-nommu.lds
@ -85,6 +85,7 @@ SECTIONS {
 	_end = .;

 	STABS_DEBUG
+	MODINFO
 	ELF_DETAILS

 	/* Sections to be discarded */
--- a/arch/m68k/kernel/vmlinux-std.lds
+++ b/arch/m68k/kernel/vmlinux-std.lds
@ -58,6 +58,7 @@ SECTIONS
  _end = . ;

  STABS_DEBUG
+  MODINFO
  ELF_DETAILS

  /* Sections to be discarded */
--- a/arch/m68k/kernel/vmlinux-sun3.lds
+++ b/arch/m68k/kernel/vmlinux-sun3.lds
@ -51,6 +51,7 @@ __init_begin = .;
  _end = . ;

  STABS_DEBUG
+  MODINFO
  ELF_DETAILS

  /* Sections to be discarded */
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@ -217,6 +217,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	/* These must appear regardless of  .  */
--- a/arch/nios2/kernel/vmlinux.lds.S
+++ b/arch/nios2/kernel/vmlinux.lds.S
@ -57,6 +57,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/openrisc/kernel/vmlinux.lds.S
+++ b/arch/openrisc/kernel/vmlinux.lds.S
@ -101,6 +101,7 @@ SECTIONS
 	/* Throw in the debugging sections */
 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

        /* Sections to be discarded -- must be last */
--- a/arch/parisc/boot/compressed/vmlinux.lds.S
+++ b/arch/parisc/boot/compressed/vmlinux.lds.S
@ -90,6 +90,7 @@ SECTIONS
 	/* Sections to be discarded */
 	DISCARDS
 	/DISCARD/ : {
+		*(.modinfo)
 #ifdef CONFIG_64BIT
 		/* temporary hack until binutils is fixed to not emit these
 		 * for static binaries
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@ -165,6 +165,7 @@ SECTIONS
 	_end = . ;

 	STABS_DEBUG
+	MODINFO
 	ELF_DETAILS
 	.note 0 : { *(.note) }

--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@ -397,6 +397,7 @@ SECTIONS
 	_end = . ;

 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@ -170,6 +170,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS
 	.riscv.attributes 0 : { *(.riscv.attributes) }

--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@ -221,6 +221,7 @@ SECTIONS
 	/* Debugging sections.	*/
 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	/*
--- a/arch/sh/kernel/vmlinux.lds.S
+++ b/arch/sh/kernel/vmlinux.lds.S
@ -89,6 +89,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@ -191,6 +191,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@ -172,6 +172,7 @@ SECTIONS

  STABS_DEBUG
  DWARF_DEBUG
+  MODINFO
  ELF_DETAILS

  DISCARDS
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@ -113,6 +113,7 @@ SECTIONS

  STABS_DEBUG
  DWARF_DEBUG
+  MODINFO
  ELF_DETAILS

  DISCARDS
--- a/arch/x86/boot/compressed/vmlinux.lds.S
+++ b/arch/x86/boot/compressed/vmlinux.lds.S
@ -88,7 +88,7 @@ SECTIONS
 	/DISCARD/ : {
 		*(.dynamic) *(.dynsym) *(.dynstr) *(.dynbss)
 		*(.hash) *(.gnu.hash)
-		*(.note.*)
+		*(.note.*) *(.modinfo)
 	}

 	.got.plt (INFO) : {
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@ -427,6 +427,7 @@ SECTIONS
 	.llvm_bb_addr_map : { *(.llvm_bb_addr_map) }
 #endif

+	MODINFO
 	ELF_DETAILS

 	DISCARDS
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@ -848,12 +848,14 @@

 /* Required sections not related to debugging. */
 #define ELF_DETAILS							\
-		.modinfo : { *(.modinfo) . = ALIGN(8); }		\
 		.comment 0 : { *(.comment) }				\
 		.symtab 0 : { *(.symtab) }				\
 		.strtab 0 : { *(.strtab) }				\
 		.shstrtab 0 : { *(.shstrtab) }

+#define MODINFO								\
+		.modinfo : { *(.modinfo) . = ALIGN(8); }
+
 #ifdef CONFIG_GENERIC_BUG
 #define BUG_TABLE							\
 	. = ALIGN(8);							\