vmlinux.lds.h: Split ELF_DETAILS from STABS_DEBUG

The .comment section doesn't belong in STABS_DEBUG. Split it out into a new macro named ELF_DETAILS. This will gain other non-debug sections that need to be accounted for when linking with --orphan-handling=warn. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Cc: linux-arch@vger.kernel.org Link: https://lore.kernel.org/r/20200821194310.3089815-5-keescook@chromium.org
2020-08-21 12:42:45 -07:00 · 2020-08-21 12:42:45 -07:00 · c604abc3f6
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@ -72,6 +72,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

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

 	STABS_DEBUG
+	ELF_DETAILS
 	DISCARDS

 	.arcextmap 0 : {
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@ -152,6 +152,7 @@ SECTIONS
 	_end = .;

 	STABS_DEBUG
+	ELF_DETAILS
 }

 /*
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@ -151,6 +151,7 @@ SECTIONS
 	_end = .;

 	STABS_DEBUG
+	ELF_DETAILS
 }

 #ifdef CONFIG_STRICT_KERNEL_RWX
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@ -241,6 +241,7 @@ SECTIONS
 	_end = .;

 	STABS_DEBUG
+	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
+	ELF_DETAILS

 	DISCARDS
 }
--- a/arch/hexagon/kernel/vmlinux.lds.S
+++ b/arch/hexagon/kernel/vmlinux.lds.S
@ -67,5 +67,6 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

 }
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@ -218,6 +218,7 @@ SECTIONS {

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

 	/* Default discards */
 	DISCARDS
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@ -202,6 +202,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

 	/* These must appear regardless of  .  */
 	.gptab.sdata : {
--- a/arch/nds32/kernel/vmlinux.lds.S
+++ b/arch/nds32/kernel/vmlinux.lds.S
@ -64,6 +64,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

 	DISCARDS
 }
--- a/arch/nios2/kernel/vmlinux.lds.S
+++ b/arch/nios2/kernel/vmlinux.lds.S
@ -58,6 +58,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

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

        /* Sections to be discarded -- must be last */
 	DISCARDS
--- a/arch/parisc/boot/compressed/vmlinux.lds.S
+++ b/arch/parisc/boot/compressed/vmlinux.lds.S
@ -84,6 +84,7 @@ SECTIONS
 	}

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

 	/* Sections to be discarded */
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@ -164,6 +164,7 @@ SECTIONS
 	_end = . ;

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

 	/* Sections to be discarded */
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@ -360,8 +360,8 @@ SECTIONS
 	PROVIDE32 (end = .);

 	STABS_DEBUG
-
 	DWARF_DEBUG
+	ELF_DETAILS

 	DISCARDS
 	/DISCARD/ : {
--- a/arch/riscv/kernel/vmlinux.lds.S
+++ b/arch/riscv/kernel/vmlinux.lds.S
@ -97,6 +97,7 @@ SECTIONS

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

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

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

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

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

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

 	DISCARDS
 }
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@ -164,8 +164,8 @@ SECTIONS
  PROVIDE (end = .);

  STABS_DEBUG
-
  DWARF_DEBUG
+  ELF_DETAILS

  DISCARDS
 }
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@ -108,8 +108,8 @@ SECTIONS
  PROVIDE (end = .);

  STABS_DEBUG
-
  DWARF_DEBUG
+  ELF_DETAILS

  DISCARDS
 }
--- a/arch/x86/boot/compressed/vmlinux.lds.S
+++ b/arch/x86/boot/compressed/vmlinux.lds.S
@ -82,6 +82,8 @@ SECTIONS
 	. = ALIGN(PAGE_SIZE);	/* keep ZO size page aligned */
 	_end = .;

+	ELF_DETAILS
+
 	DISCARDS
 }

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

 	STABS_DEBUG
 	DWARF_DEBUG
+	ELF_DETAILS

 	DISCARDS
 }
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@ -34,6 +34,7 @@
 *
 *	STABS_DEBUG
 *	DWARF_DEBUG
+ *	ELF_DETAILS
 *
 *	DISCARDS		// must be the last
 * }
@ -811,14 +812,17 @@
 		.debug_macro	0 : { *(.debug_macro) }			\
 		.debug_addr	0 : { *(.debug_addr) }

-		/* Stabs debugging sections.  */
+/* Stabs debugging sections. */
 #define STABS_DEBUG							\
 		.stab 0 : { *(.stab) }					\
 		.stabstr 0 : { *(.stabstr) }				\
 		.stab.excl 0 : { *(.stab.excl) }			\
 		.stab.exclstr 0 : { *(.stab.exclstr) }			\
 		.stab.index 0 : { *(.stab.index) }			\
-		.stab.indexstr 0 : { *(.stab.indexstr) }		\
+		.stab.indexstr 0 : { *(.stab.indexstr) }
+
+/* Required sections not related to debugging. */
+#define ELF_DETAILS							\
 		.comment 0 : { *(.comment) }

 #ifdef CONFIG_GENERIC_BUG