On Thu, Feb 27, 2020 at 04:22:41PM -0800, Kees Cook wrote:
> Use the common DISCARDS rule for the linker script in an effort to
> regularize the linker script to prepare for warning on orphaned
> sections.
>
> Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
> ---
> arch/arm64/kernel/vmlinux.lds.S | 8 ++------
> 1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
> index 497f9675071d..c61d9ab3211c 100644
> --- a/arch/arm64/kernel/vmlinux.lds.S
> +++ b/arch/arm64/kernel/vmlinux.lds.S
> @@ -6,6 +6,7 @@
> */
>
> #define RO_EXCEPTION_TABLE_ALIGN 8
> +#define RUNTIME_DISCARD_EXIT
>
> #include <asm-generic/vmlinux.lds.h>
> #include <asm/cache.h>
> @@ -19,7 +20,6 @@
>
> /* .exit.text needed in case of alternative patching */
> #define ARM_EXIT_KEEP(x) x
> -#define ARM_EXIT_DISCARD(x)
>
> OUTPUT_ARCH(aarch64)
> ENTRY(_text)
> @@ -94,12 +94,8 @@ SECTIONS
> * matching the same input section name. There is no documented
> * order of matching.
> */
> + DISCARDS
> /DISCARD/ : {
> - ARM_EXIT_DISCARD(EXIT_TEXT)
> - ARM_EXIT_DISCARD(EXIT_DATA)
> - EXIT_CALL
> - *(.discard)
> - *(.discard.*)
> *(.interp .dynamic)
> *(.dynsym .dynstr .hash .gnu.hash)
> *(.eh_frame)
Acked-by: Will Deacon <will@xxxxxxxxxx>
Will
