From: Kees Cook <keescook@chromium.org> To: Borislav Petkov <bp@suse.de> Cc: Kees Cook <keescook@chromium.org>, "H.J. Lu" <hjl.tools@gmail.com>, Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Peter Collingbourne <pcc@google.com>, James Morse <james.morse@arm.com>, Arnd Bergmann <arnd@arndb.de>, Masahiro Yamada <masahiroy@kernel.org>, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org, linux-kbuild@vger.kernel.org, clang-built-linux@googlegroups.com, linux-kernel@vger.kernel.org Subject: [PATCH 5/9] Add RUNTIME_DISCARD_EXIT to generic DISCARDS Date: Thu, 27 Feb 2020 16:22:40 -0800 [thread overview] Message-ID: <20200228002244.15240-6-keescook@chromium.org> (raw) In-Reply-To: <20200228002244.15240-1-keescook@chromium.org> From: "H.J. Lu" <hjl.tools@gmail.com> In x86 kernel, .exit.text and .exit.data sections are discarded at runtime, not by linker. Add RUNTIME_DISCARD_EXIT to generic DISCARDS and define it in x86 kernel linker script to keep them. Signed-off-by: H.J. Lu <hjl.tools@gmail.com> Link: https://lore.kernel.org/r/20200130224337.4150-1-hjl.tools@gmail.com Signed-off-by: Kees Cook <keescook@chromium.org> --- arch/x86/kernel/vmlinux.lds.S | 1 + include/asm-generic/vmlinux.lds.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 1e345f302a46..1e12c097d09b 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -21,6 +21,7 @@ #define LOAD_OFFSET __START_KERNEL_map #endif +#define RUNTIME_DISCARD_EXIT #define EMITS_PT_NOTE #define RO_EXCEPTION_TABLE_ALIGN 16 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 303597e51396..1797f2c9bb41 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -894,10 +894,16 @@ * section definitions so that such archs put those in earlier section * definitions. */ +#ifdef RUNTIME_DISCARD_EXIT +#define EXIT_DISCARDS +#else +#define EXIT_DISCARDS \ + EXIT_TEXT \ + EXIT_DATA +#endif #define DISCARDS \ /DISCARD/ : { \ - EXIT_TEXT \ - EXIT_DATA \ + EXIT_DISCARDS \ EXIT_CALL \ *(.discard) \ *(.discard.*) \ -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Kees Cook <keescook@chromium.org> To: Borislav Petkov <bp@suse.de> Cc: Mark Rutland <mark.rutland@arm.com>, "H.J. Lu" <hjl.tools@gmail.com>, Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>, linux-kbuild@vger.kernel.org, Peter Collingbourne <pcc@google.com>, Catalin Marinas <catalin.marinas@arm.com>, Masahiro Yamada <masahiroy@kernel.org>, x86@kernel.org, Russell King <linux@armlinux.org.uk>, linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, James Morse <james.morse@arm.com>, linux-arch@vger.kernel.org, Will Deacon <will@kernel.org>, linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/9] Add RUNTIME_DISCARD_EXIT to generic DISCARDS Date: Thu, 27 Feb 2020 16:22:40 -0800 [thread overview] Message-ID: <20200228002244.15240-6-keescook@chromium.org> (raw) In-Reply-To: <20200228002244.15240-1-keescook@chromium.org> From: "H.J. Lu" <hjl.tools@gmail.com> In x86 kernel, .exit.text and .exit.data sections are discarded at runtime, not by linker. Add RUNTIME_DISCARD_EXIT to generic DISCARDS and define it in x86 kernel linker script to keep them. Signed-off-by: H.J. Lu <hjl.tools@gmail.com> Link: https://lore.kernel.org/r/20200130224337.4150-1-hjl.tools@gmail.com Signed-off-by: Kees Cook <keescook@chromium.org> --- arch/x86/kernel/vmlinux.lds.S | 1 + include/asm-generic/vmlinux.lds.h | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 1e345f302a46..1e12c097d09b 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -21,6 +21,7 @@ #define LOAD_OFFSET __START_KERNEL_map #endif +#define RUNTIME_DISCARD_EXIT #define EMITS_PT_NOTE #define RO_EXCEPTION_TABLE_ALIGN 16 diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 303597e51396..1797f2c9bb41 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -894,10 +894,16 @@ * section definitions so that such archs put those in earlier section * definitions. */ +#ifdef RUNTIME_DISCARD_EXIT +#define EXIT_DISCARDS +#else +#define EXIT_DISCARDS \ + EXIT_TEXT \ + EXIT_DATA +#endif #define DISCARDS \ /DISCARD/ : { \ - EXIT_TEXT \ - EXIT_DATA \ + EXIT_DISCARDS \ EXIT_CALL \ *(.discard) \ *(.discard.*) \ -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-02-28 0:23 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-28 0:22 [PATCH 0/9] Enable orphan section warning Kees Cook 2020-02-28 0:22 ` Kees Cook 2020-02-28 0:22 ` [PATCH 1/9] scripts/link-vmlinux.sh: Delay orphan handling warnings until final link Kees Cook 2020-02-28 0:22 ` Kees Cook 2020-03-20 2:47 ` Nicholas Piggin 2020-03-20 2:47 ` Nicholas Piggin 2020-03-20 18:24 ` Kees Cook 2020-03-20 18:24 ` Kees Cook 2020-03-22 9:16 ` Nicholas Piggin 2020-03-22 9:16 ` Nicholas Piggin 2020-03-22 16:00 ` Kees Cook 2020-03-22 16:00 ` Kees Cook 2020-02-28 0:22 ` [PATCH 2/9] vmlinux.lds.h: Add .gnu.version* to DISCARDS Kees Cook 2020-02-28 0:22 ` Kees Cook 2020-02-28 0:22 ` [PATCH 3/9] x86/build: Warn on orphan section placement Kees Cook 2020-02-28 0:22 ` Kees Cook 2020-02-28 0:22 ` [PATCH 4/9] x86/boot: " Kees Cook 2020-02-28 0:22 ` Kees Cook 2020-02-28 0:22 ` Kees Cook [this message] 2020-02-28 0:22 ` [PATCH 5/9] Add RUNTIME_DISCARD_EXIT to generic DISCARDS Kees Cook 2020-02-28 0:22 ` [PATCH 6/9] arm64/build: Use common DISCARDS in linker script Kees Cook 2020-02-28 0:22 ` Kees Cook 2020-03-17 21:52 ` Will Deacon 2020-03-17 21:52 ` Will Deacon 2020-02-28 0:22 ` [PATCH 7/9] arm64/build: Warn on orphan section placement Kees Cook 2020-02-28 0:22 ` Kees Cook 2020-03-17 21:56 ` Will Deacon 2020-03-17 21:56 ` Will Deacon 2020-03-17 23:01 ` Kees Cook 2020-03-17 23:01 ` Kees Cook 2020-03-17 23:10 ` Nick Desaulniers 2020-03-17 23:10 ` Nick Desaulniers 2020-02-28 0:22 ` [PATCH 8/9] arm/build: " Kees Cook 2020-02-28 0:22 ` Kees Cook 2020-02-28 0:22 ` [PATCH 9/9] arm/boot: " Kees Cook 2020-02-28 0:22 ` Kees Cook 2020-02-28 6:51 ` [PATCH 0/9] Enable orphan section warning Sedat Dilek 2020-02-28 6:51 ` Sedat Dilek 2020-03-03 4:32 ` Kees Cook 2020-03-03 4:32 ` Kees Cook 2020-04-02 16:20 ` Sedat Dilek 2020-04-02 16:20 ` Sedat Dilek 2020-04-02 17:26 ` Kees Cook 2020-04-02 17:26 ` Kees Cook 2020-04-05 11:15 ` Sedat Dilek 2020-04-05 11:15 ` Sedat Dilek
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200228002244.15240-6-keescook@chromium.org \ --to=keescook@chromium.org \ --cc=arnd@arndb.de \ --cc=bp@suse.de \ --cc=catalin.marinas@arm.com \ --cc=clang-built-linux@googlegroups.com \ --cc=hjl.tools@gmail.com \ --cc=james.morse@arm.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kbuild@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=mark.rutland@arm.com \ --cc=masahiroy@kernel.org \ --cc=pcc@google.com \ --cc=will@kernel.org \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.