arm/build: Explicitly keep .ARM.attributes sections

In preparation for adding --orphan-handling=warn, explicitly keep the
.ARM.attributes section (at address 0[1]) by expanding the existing
ELF_DETAILS macro into ARM_DETAILS.

[1] https://reviews.llvm.org/D85867

Suggested-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Fangrui Song <maskray@google.com>
Cc: Russell King <linux@armlinux.org.uk>
Link: https://lore.kernel.org/lkml/CAKwvOdk-racgq5pxsoGS6Vtifbtrk5fmkmnoLxrQMaOvV0nPWw@mail.gmail.com/
Link: https://lore.kernel.org/r/20200821194310.3089815-17-keescook@chromium.org

diff --git a/arch/arm/include/asm/vmlinux.lds.h b/arch/arm/include/asm/vmlinux.lds.h
index a08f4301b718b98c6045c1b74d9bb609d75b6f4e..c4af5182ab48d096eed15daee7026c192c15f91c 100644 (file)
--- a/arch/arm/include/asm/vmlinux.lds.h
+++ b/arch/arm/include/asm/vmlinux.lds.h
@@ -52,6 +52,10 @@
                ARM_MMU_DISCARD(*(__ex_table))                          \
                COMMON_DISCARDS
 
+#define ARM_DETAILS                                                    \
+               ELF_DETAILS                                             \
+               .ARM.attributes 0 : { *(.ARM.attributes) }
+
 #define ARM_STUBS_TEXT                                                 \
                *(.gnu.warning)                                         \
                *(.glue_7)                                              \

diff --git a/arch/arm/kernel/vmlinux-xip.lds.S b/arch/arm/kernel/vmlinux-xip.lds.S
index 904c31fa20edf55ba589f90d06ff3e26a87c6b39..57fcbf55f91331774c938cbabf124f6238d6beee 100644 (file)
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -150,7 +150,7 @@ SECTIONS
        _end = .;
 
        STABS_DEBUG
-       ELF_DETAILS
+       ARM_DETAILS
 }
 
 /*

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index bb950c896a67e20717d3008256ac8c45d5d23b00..1d3d3b599635a655fa1cfc24f2285e1d71f2af37 100644 (file)
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -149,7 +149,7 @@ SECTIONS
        _end = .;
 
        STABS_DEBUG
-       ELF_DETAILS
+       ARM_DETAILS
 }
 
 #ifdef CONFIG_STRICT_KERNEL_RWX