Commit 8c2ab803 authored Oct 27, 2020 by Linus Torvalds

linux

Pull orphan section fixes from Kees Cook:
 "A couple corner cases were found from the link-time orphan section
  handling series:

   - arm: handle .ARM.exidx and .ARM.extab sections (Nathan Chancellor)

   - x86: collect .ctors.* with .ctors (Kees Cook)"

* tag 'orphan-handling-v5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  arm/build: Always handle .ARM.exidx and .ARM.extab sections
  vmlinux.lds.h: Keep .ctors.* with .ctors

parents f78f63da c39866f2

arch/arm/kernel/vmlinux.lds.S

+4 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,10 @@ SECTIONS
		ARM_DISCARD
		#ifndef CONFIG_SMP_ON_UP
		*(.alt.smp.init)
		#endif
		#ifndef CONFIG_ARM_UNWIND
		(.ARM.exidx) (.ARM.exidx.*)
		(.ARM.extab) (.ARM.extab.*)
		#endif
		}

include/asm-generic/vmlinux.lds.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -701,6 +701,7 @@
		#ifdef CONFIG_CONSTRUCTORS
		#define KERNEL_CTORS() . = ALIGN(8); \
		__ctors_start = .; \
		KEEP((SORT(.ctors.))) \
		KEEP(*(.ctors)) \
		KEEP((SORT(.init_array.))) \
		KEEP(*(.init_array)) \

Admin message