The following commit has been merged into the x86/build branch of tip:

Commit-ID:     19f6bc32c6f4216e099963f416de91eba7ca1430
Gitweb:        
https://git.kernel.org/tip/19f6bc32c6f4216e099963f416de91eba7ca1430
Author:        Kees Cook <[email protected]>
AuthorDate:    Tue, 29 Oct 2019 14:13:40 -07:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Mon, 04 Nov 2019 18:02:35 +01:00

arm64: Move EXCEPTION_TABLE to RO_DATA segment

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA. Also
removes the redundant ALIGN, which is already present at the end of the
RO_DATA macro.

Signed-off-by: Kees Cook <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Acked-by: Will Deacon <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Ard Biesheuvel <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Catalin Marinas <[email protected]>
Cc: Dave Hansen <[email protected]>
Cc: Heiko Carstens <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: Michael Ellerman <[email protected]>
Cc: Michal Simek <[email protected]>
Cc: Peter Collingbourne <[email protected]>
Cc: Rick Edgecombe <[email protected]>
Cc: Segher Boessenkool <[email protected]>
Cc: x86-ml <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]
---
 arch/arm64/kernel/vmlinux.lds.S | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index a4b3e6c..9128a26 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -5,6 +5,8 @@
  * Written by Martin Mares <[email protected]>
  */
 
+#define RO_EXCEPTION_TABLE_ALIGN       8
+
 #include <asm-generic/vmlinux.lds.h>
 #include <asm/cache.h>
 #include <asm/kernel-pgtable.h>
@@ -135,10 +137,9 @@ SECTIONS
        . = ALIGN(SEGMENT_ALIGN);
        _etext = .;                     /* End of text section */
 
-       RO_DATA(PAGE_SIZE)              /* everything from this point to     */
-       EXCEPTION_TABLE(8)              /* __init_begin will be marked RO NX */
+       /* everything from this point to __init_begin will be marked RO NX */
+       RO_DATA(PAGE_SIZE)
 
-       . = ALIGN(PAGE_SIZE);
        idmap_pg_dir = .;
        . += IDMAP_DIR_SIZE;
 

Reply via email to