[tip: x86/build] h8300: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 380e57e2d41e9631132beccac30058228dfd376f
Gitweb:
https://git.kernel.org/tip/380e57e2d41e9631132beccac30058228dfd376f
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:42 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 18:12:55 +01:00

h8300: Move EXCEPTION_TABLE to RO_DATA segment

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Geert Uytterhoeven 
Cc: Heiko Carstens 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: uclinux-h8-de...@lists.sourceforge.jp
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-21-keesc...@chromium.org
---
 arch/h8300/kernel/vmlinux.lds.S | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index 2ac7bdc..6b1afc2 100644
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -1,4 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+
+#define RO_EXCEPTION_TABLE_ALIGN   16
+
 #include 
 #include 
 #include 
@@ -37,7 +40,6 @@ SECTIONS
 #endif
_etext = . ;
}
-   EXCEPTION_TABLE(16)
RO_DATA(4)
ROMEND = .;
 #if defined(CONFIG_ROMKERNEL)

[tip: x86/build] x86/vmlinux: Restore "text" Program Header with dummy section

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 7a42d41d9dc2829bdf589db855ce3f948de2da6b
Gitweb:
https://git.kernel.org/tip/7a42d41d9dc2829bdf589db855ce3f948de2da6b
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:29 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:34:36 +01:00

x86/vmlinux: Restore "text" Program Header with dummy section

In a linker script, if one places a section in one or more segments using
":PHDR", then the linker will place all subsequent allocatable sections,
which do not specify ":PHDR", into the same segments. In order to have
the NOTES section in both PT_LOAD (":text") and PT_NOTE (":note"), both
segments are marked, and the only way to undo this to keep subsequent
sections out of PT_NOTE is to mark the following section with just the
single desired PT_LOAD (":text").

In preparation for having a common NOTES macro, perform the segment
assignment using a dummy section (as done by other architectures).

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Cc: x86-ml 
Link: https://lkml.kernel.org/r/20191029211351.13243-8-keesc...@chromium.org
---
 arch/x86/kernel/vmlinux.lds.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index e2feacf..788e789 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -147,8 +147,9 @@ SECTIONS
} :text = 0x9090
 
NOTES :text :note
+   .dummy : { *(.dummy) } :text
 
-   EXCEPTION_TABLE(16) :text = 0x9090
+   EXCEPTION_TABLE(16)
 
/* .text should occupy whole number of pages */
. = ALIGN(PAGE_SIZE);

[tip: x86/build] xtensa: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 94174c9b71c62a0e1a4364c2594e1422ba8fffcd
Gitweb:
https://git.kernel.org/tip/94174c9b71c62a0e1a4364c2594e1422ba8fffcd
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:47 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 18:42:27 +01:00

xtensa: Move EXCEPTION_TABLE to RO_DATA segment

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Max Filippov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Chris Zankel 
Cc: Dave Hansen 
Cc: Geert Uytterhoeven 
Cc: Heiko Carstens 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: linux-xte...@linux-xtensa.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-26-keesc...@chromium.org
---
 arch/xtensa/kernel/vmlinux.lds.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index bdbd7c4..0043d58 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -14,6 +14,8 @@
  * Joe Taylor 
  */
 
+#define RO_EXCEPTION_TABLE_ALIGN   16
+
 #include 
 #include 
 #include 
@@ -130,7 +132,6 @@ SECTIONS
 
   .fixup   : { *(.fixup) }
 
-  EXCEPTION_TABLE(16)
   /* Data section */
 
   _sdata = .;

[tip: x86/build] ia64: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 9b30e704dd0d9ef9d99c7f88712318840cc8a338
Gitweb:
https://git.kernel.org/tip/9b30e704dd0d9ef9d99c7f88712318840cc8a338
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:43 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 18:14:41 +01:00

ia64: Move EXCEPTION_TABLE to RO_DATA segment

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Fenghua Yu 
Cc: Heiko Carstens 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Tony Luck 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-22-keesc...@chromium.org
---
 arch/ia64/kernel/vmlinux.lds.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 11d5115..1ec6b70 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -6,6 +6,7 @@
 #include 
 
 #define EMITS_PT_NOTE
+#define RO_EXCEPTION_TABLE_ALIGN   16
 
 #include 
 
@@ -70,7 +71,6 @@ SECTIONS {
/*
 * Read-only data
 */
-   EXCEPTION_TABLE(16)
 
/* MCA table */
. = ALIGN(16);

[tip: x86/build] x86/mm: Remove redundant address-of operators on addresses

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 2d0004d19829c84aaf2c7d48b5e2892d548970b6
Gitweb:
https://git.kernel.org/tip/2d0004d19829c84aaf2c7d48b5e2892d548970b6
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:48 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 18:46:55 +01:00

x86/mm: Remove redundant address-of operators on addresses

The  on addresses are redundant. Remove them to match all the other
similar functions.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Heiko Carstens 
Cc: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Peter Zijlstra 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-27-keesc...@chromium.org
---
 arch/x86/mm/init_64.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 26299e9..e67ddca 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1300,9 +1300,9 @@ void mark_rodata_ro(void)
 {
unsigned long start = PFN_ALIGN(_text);
unsigned long rodata_start = PFN_ALIGN(__start_rodata);
-   unsigned long end = (unsigned long) &__end_rodata_hpage_align;
-   unsigned long text_end = PFN_ALIGN(&_etext);
-   unsigned long rodata_end = PFN_ALIGN(&__end_rodata);
+   unsigned long end = (unsigned long)__end_rodata_hpage_align;
+   unsigned long text_end = PFN_ALIGN(_etext);
+   unsigned long rodata_end = PFN_ALIGN(__end_rodata);
unsigned long all_end;
 
printk(KERN_INFO "Write protecting the kernel read-only data: %luk\n",

[tip: x86/build] vmlinux.lds.h: Replace RODATA with RO_DATA

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: c82318254d15e5f83c75f60aedf2bb9eb408308f
Gitweb:
https://git.kernel.org/tip/c82318254d15e5f83c75f60aedf2bb9eb408308f
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:33 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:53:15 +01:00

vmlinux.lds.h: Replace RODATA with RO_DATA

There's no reason to keep the RODATA macro: replace the callers with
the expected RO_DATA macro.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-12-keesc...@chromium.org
---
 arch/alpha/kernel/vmlinux.lds.S  | 2 +-
 arch/ia64/kernel/vmlinux.lds.S   | 2 +-
 arch/microblaze/kernel/vmlinux.lds.S | 2 +-
 arch/mips/kernel/vmlinux.lds.S   | 2 +-
 arch/um/include/asm/common.lds.S | 2 +-
 arch/xtensa/kernel/vmlinux.lds.S | 2 +-
 include/asm-generic/vmlinux.lds.h| 4 +---
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index bf28043..af41181 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -34,7 +34,7 @@ SECTIONS
swapper_pg_dir = SWAPPER_PGD;
_etext = .; /* End of text section */
 
-   RODATA
+   RO_DATA(4096)
EXCEPTION_TABLE(16)
 
/* Will be freed after init */
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index fae0775..11d5115 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -104,7 +104,7 @@ SECTIONS {
code_continues2 : {
} :text
 
-   RODATA
+   RO_DATA(4096)
 
.opd : AT(ADDR(.opd) - LOAD_OFFSET) {
__start_opd = .;
diff --git a/arch/microblaze/kernel/vmlinux.lds.S 
b/arch/microblaze/kernel/vmlinux.lds.S
index d008e50..2299694 100644
--- a/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@ -51,7 +51,7 @@ SECTIONS {
}
 
. = ALIGN(16);
-   RODATA
+   RO_DATA(4096)
EXCEPTION_TABLE(16)
 
/*
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 91e566d..a5f00ec 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -82,7 +82,7 @@ SECTIONS
}
 
_sdata = .; /* Start of data section */
-   RODATA
+   RO_DATA(4096)
 
/* writeable */
.data : {   /* Data */
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S
index 91aca35..7145ce6 100644
--- a/arch/um/include/asm/common.lds.S
+++ b/arch/um/include/asm/common.lds.S
@@ -9,7 +9,7 @@
   _sdata = .;
   PROVIDE (sdata = .);
 
-  RODATA
+  RO_DATA(4096)
 
   .unprotected : { *(.unprotected) }
   . = ALIGN(4096);
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S
index a0a8437..b97e579 100644
--- a/arch/xtensa/kernel/vmlinux.lds.S
+++ b/arch/xtensa/kernel/vmlinux.lds.S
@@ -124,7 +124,7 @@ SECTIONS
 
   . = ALIGN(16);
 
-  RODATA
+  RO_DATA(4096)
 
   /*  Relocation table */
 
diff --git a/include/asm-generic/vmlinux.lds.h 
b/include/asm-generic/vmlinux.lds.h
index dc3390e..a0a989f 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -518,9 +518,7 @@
. = ALIGN((align)); \
__end_rodata = .;
 
-/* RODATA & RO_DATA provided for backward compatibility.
- * All archs are supposed to use RO_DATA() */
-#define RODATA  RO_DATA_SECTION(4096)
+/* All archs are supposed to use RO_DATA() */
 #define RO_DATA(align)  RO_DATA_SECTION(align)
 
 /*

[tip: x86/build] arm64: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
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 
AuthorDate:Tue, 29 Oct 2019 14:13:40 -07:00
Committer: Borislav Petkov 
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 
Signed-off-by: Borislav Petkov 
Acked-by: Will Deacon 
Cc: Andy Lutomirski 
Cc: Ard Biesheuvel 
Cc: Arnd Bergmann 
Cc: Catalin Marinas 
Cc: Dave Hansen 
Cc: Heiko Carstens 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Peter Collingbourne 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-19-keesc...@chromium.org
---
 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 
  */
 
+#define RO_EXCEPTION_TABLE_ALIGN   8
+
 #include 
 #include 
 #include 
@@ -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;

[tip: x86/build] alpha: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 172c8b85dccf331826deda9ef6d7e75fa4f2b3e2
Gitweb:
https://git.kernel.org/tip/172c8b85dccf331826deda9ef6d7e75fa4f2b3e2
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:39 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 17:57:56 +01:00

alpha: Move EXCEPTION_TABLE to RO_DATA segment

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Geert Uytterhoeven 
Cc: Heiko Carstens 
Cc: Ivan Kokshaysky 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Matt Turner 
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Richard Henderson 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x...@kernel.org
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-18-keesc...@chromium.org
---
 arch/alpha/kernel/vmlinux.lds.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index edc45f4..bc6f727 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 
 #define EMITS_PT_NOTE
+#define RO_EXCEPTION_TABLE_ALIGN   16
 
 #include 
 #include 
@@ -35,7 +36,6 @@ SECTIONS
_etext = .; /* End of text section */
 
RO_DATA(4096)
-   EXCEPTION_TABLE(16)
 
/* Will be freed after init */
__init_begin = ALIGN(PAGE_SIZE);

[tip: x86/build] c6x: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 1e51cd538809112a6ac702a48e9719a75152c902
Gitweb:
https://git.kernel.org/tip/1e51cd538809112a6ac702a48e9719a75152c902
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:41 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 18:10:58 +01:00

c6x: Move EXCEPTION_TABLE to RO_DATA segment

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Aurelien Jacquiot 
Cc: Dave Hansen 
Cc: Geert Uytterhoeven 
Cc: Heiko Carstens 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Mark Salter 
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-20-keesc...@chromium.org
---
 arch/c6x/kernel/vmlinux.lds.S | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S
index a3547f9..ac99ba0 100644
--- a/arch/c6x/kernel/vmlinux.lds.S
+++ b/arch/c6x/kernel/vmlinux.lds.S
@@ -5,6 +5,9 @@
  *  Copyright (C) 2010, 2011 Texas Instruments Incorporated
  *  Mark Salter 
  */
+
+#define RO_EXCEPTION_TABLE_ALIGN   16
+
 #include 
 #include 
 #include 
@@ -80,8 +83,6 @@ SECTIONS
*(.gnu.warning)
}
 
-   EXCEPTION_TABLE(16)
-
RO_DATA(PAGE_SIZE)
.const :
{

[tip: x86/build] parisc: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 6e85e23ef2d004def8e1acd36eb155411499b7cc
Gitweb:
https://git.kernel.org/tip/6e85e23ef2d004def8e1acd36eb155411499b7cc
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:45 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 18:22:10 +01:00

parisc: Move EXCEPTION_TABLE to RO_DATA segment

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Helge Deller 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Geert Uytterhoeven 
Cc: Heiko Carstens 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-par...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Sven Schnelle 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-24-keesc...@chromium.org
---
 arch/parisc/kernel/vmlinux.lds.S | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S
index 12b3d7d..53e29d8 100644
--- a/arch/parisc/kernel/vmlinux.lds.S
+++ b/arch/parisc/kernel/vmlinux.lds.S
@@ -19,6 +19,7 @@
*(.data..vm0.pte)
 
 #define CC_USING_PATCHABLE_FUNCTION_ENTRY
+#define RO_EXCEPTION_TABLE_ALIGN   8
 
 #include 
 
@@ -129,9 +130,6 @@ SECTIONS
 
RO_DATA(8)
 
-   /* RO because of BUILDTIME_EXTABLE_SORT */
-   EXCEPTION_TABLE(8)
-
/* unwind info */
.PARISC.unwind : {
__start___unwind = .;

[tip: x86/build] x86/mm: Report which part of kernel image is freed

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 5494c3a6a0b965906ffdcb620d94079ea4cb69ea
Gitweb:
https://git.kernel.org/tip/5494c3a6a0b965906ffdcb620d94079ea4cb69ea
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:49 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 18:50:33 +01:00

x86/mm: Report which part of kernel image is freed

The memory freeing report wasn't very useful for figuring out which
parts of the kernel image were being freed. Add the details for clearer
reporting in dmesg.

Before:

  Freeing unused kernel image memory: 1348K
  Write protecting the kernel read-only data: 20480k
  Freeing unused kernel image memory: 2040K
  Freeing unused kernel image memory: 172K

After:

  Freeing unused kernel image (initmem) memory: 1348K
  Write protecting the kernel read-only data: 20480k
  Freeing unused kernel image (text/rodata gap) memory: 2040K
  Freeing unused kernel image (rodata/data gap) memory: 172K

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Heiko Carstens 
Cc: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Peter Zijlstra 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-28-keesc...@chromium.org
---
 arch/x86/include/asm/processor.h | 2 +-
 arch/x86/mm/init.c   | 8 
 arch/x86/mm/init_64.c| 6 --
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 6e0a3b4..790f250 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -958,7 +958,7 @@ static inline uint32_t hypervisor_cpuid_base(const char 
*sig, uint32_t leaves)
 
 extern unsigned long arch_align_stack(unsigned long sp);
 void free_init_pages(const char *what, unsigned long begin, unsigned long end);
-extern void free_kernel_image_pages(void *begin, void *end);
+extern void free_kernel_image_pages(const char *what, void *begin, void *end);
 
 void default_idle(void);
 #ifdef CONFIG_XEN
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index fd10d91..e7bb483 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -829,14 +829,13 @@ void free_init_pages(const char *what, unsigned long 
begin, unsigned long end)
  * used for the kernel image only.  free_init_pages() will do the
  * right thing for either kind of address.
  */
-void free_kernel_image_pages(void *begin, void *end)
+void free_kernel_image_pages(const char *what, void *begin, void *end)
 {
unsigned long begin_ul = (unsigned long)begin;
unsigned long end_ul = (unsigned long)end;
unsigned long len_pages = (end_ul - begin_ul) >> PAGE_SHIFT;
 
-
-   free_init_pages("unused kernel image", begin_ul, end_ul);
+   free_init_pages(what, begin_ul, end_ul);
 
/*
 * PTI maps some of the kernel into userspace.  For performance,
@@ -865,7 +864,8 @@ void __ref free_initmem(void)
 
mem_encrypt_free_decrypted_mem();
 
-   free_kernel_image_pages(&__init_begin, &__init_end);
+   free_kernel_image_pages("unused kernel image (initmem)",
+   &__init_begin, &__init_end);
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index e67ddca..dcb9bc9 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1334,8 +1334,10 @@ void mark_rodata_ro(void)
set_memory_ro(start, (end-start) >> PAGE_SHIFT);
 #endif
 
-   free_kernel_image_pages((void *)text_end, (void *)rodata_start);
-   free_kernel_image_pages((void *)rodata_end, (void *)_sdata);
+   free_kernel_image_pages("unused kernel image (text/rodata gap)",
+   (void *)text_end, (void *)rodata_start);
+   free_kernel_image_pages("unused kernel image (rodata/data gap)",
+   (void *)rodata_end, (void *)_sdata);
 
debug_checkwx();
 }

[tip: x86/build] x86/vmlinux: Actually use _etext for the end of the text segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: b907693883fdcff5b492cf0cd02a0e264623055e
Gitweb:
https://git.kernel.org/tip/b907693883fdcff5b492cf0cd02a0e264623055e
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:37 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 17:54:16 +01:00

x86/vmlinux: Actually use _etext for the end of the text segment

Various calculations are using the end of the exception table (which
does not need to be executable) as the end of the text segment. Instead,
in preparation for moving the exception table into RO_DATA, move _etext
after the exception table and update the calculations.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Heiko Carstens 
Cc: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Nick Desaulniers 
Cc: Peter Zijlstra 
Cc: Rick Edgecombe 
Cc: Ross Zwisler 
Cc: Segher Boessenkool 
Cc: Thomas Gleixner 
Cc: Thomas Lendacky 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-16-keesc...@chromium.org
---
 arch/x86/include/asm/sections.h | 1 -
 arch/x86/kernel/vmlinux.lds.S   | 7 +++
 arch/x86/mm/init_64.c   | 6 +++---
 arch/x86/mm/pti.c   | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/arch/x86/include/asm/sections.h b/arch/x86/include/asm/sections.h
index 71b32f2..036c360 100644
--- a/arch/x86/include/asm/sections.h
+++ b/arch/x86/include/asm/sections.h
@@ -6,7 +6,6 @@
 #include 
 
 extern char __brk_base[], __brk_limit[];
-extern struct exception_table_entry __stop___ex_table[];
 extern char __end_rodata_aligned[];
 
 #if defined(CONFIG_X86_64)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 41362e9..a1a758e 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -143,15 +143,14 @@ SECTIONS
*(.text.__x86.indirect_thunk)
__indirect_thunk_end = .;
 #endif
-
-   /* End of text section */
-   _etext = .;
} :text = 0x9090
 
EXCEPTION_TABLE(16)
 
-   /* .text should occupy whole number of pages */
+   /* End of text section, which should occupy whole number of pages */
+   _etext = .;
. = ALIGN(PAGE_SIZE);
+
X86_ALIGN_RODATA_BEGIN
RO_DATA(PAGE_SIZE)
X86_ALIGN_RODATA_END
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index a6b5c65..26299e9 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -1263,7 +1263,7 @@ int kernel_set_to_readonly;
 void set_kernel_text_rw(void)
 {
unsigned long start = PFN_ALIGN(_text);
-   unsigned long end = PFN_ALIGN(__stop___ex_table);
+   unsigned long end = PFN_ALIGN(_etext);
 
if (!kernel_set_to_readonly)
return;
@@ -1282,7 +1282,7 @@ void set_kernel_text_rw(void)
 void set_kernel_text_ro(void)
 {
unsigned long start = PFN_ALIGN(_text);
-   unsigned long end = PFN_ALIGN(__stop___ex_table);
+   unsigned long end = PFN_ALIGN(_etext);
 
if (!kernel_set_to_readonly)
return;
@@ -1301,7 +1301,7 @@ void mark_rodata_ro(void)
unsigned long start = PFN_ALIGN(_text);
unsigned long rodata_start = PFN_ALIGN(__start_rodata);
unsigned long end = (unsigned long) &__end_rodata_hpage_align;
-   unsigned long text_end = PFN_ALIGN(&__stop___ex_table);
+   unsigned long text_end = PFN_ALIGN(&_etext);
unsigned long rodata_end = PFN_ALIGN(&__end_rodata);
unsigned long all_end;
 
diff --git a/arch/x86/mm/pti.c b/arch/x86/mm/pti.c
index 7f21404..44a9f06 100644
--- a/arch/x86/mm/pti.c
+++ b/arch/x86/mm/pti.c
@@ -574,7 +574,7 @@ static void pti_clone_kernel_text(void)
 */
unsigned long start = PFN_ALIGN(_text);
unsigned long end_clone  = (unsigned long)__end_rodata_aligned;
-   unsigned long end_global = PFN_ALIGN((unsigned long)__stop___ex_table);
+   unsigned long end_global = PFN_ALIGN((unsigned long)_etext);
 
if (!pti_kernel_image_global_ok())
return;

[tip: x86/build] x86/vmlinux: Use INT3 instead of NOP for linker fill bytes

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 7705dc8557973d8ad8f10840f61d8ec805695e9e
Gitweb:
https://git.kernel.org/tip/7705dc8557973d8ad8f10840f61d8ec805695e9e
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:51 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 19:10:08 +01:00

x86/vmlinux: Use INT3 instead of NOP for linker fill bytes

Instead of using 0x90 (NOP) to fill bytes between functions, which makes
it easier to sloppily target functions in function pointer overwrite
attacks, fill with 0xCC (INT3) to force a trap. Also drop the space
between "=" and the value to better match the binutils documentation

  
https://sourceware.org/binutils/docs/ld/Output-Section-Fill.html#Output-Section-Fill

Example "objdump -d" before:

  ...
  810001e0 :
  810001e0:   48 8b 25 e1 b1 51 01mov 0x151b1e1(%rip),%rsp  
  # 8251b3c8 
  810001e7:   e9 d5 fe ff ff  jmpq   81c1 

  810001ec:   90  nop
  810001ed:   90  nop
  810001ee:   90  nop
  810001ef:   90  nop

  810001f0 <__startup_64>:
  ...

After:

  ...
  810001e0 :
  810001e0:   48 8b 25 41 79 53 01mov 0x1537941(%rip),%rsp  
  # 82537b28 
  810001e7:   e9 d5 fe ff ff  jmpq   81c1 

  810001ec:   cc  int3
  810001ed:   cc  int3
  810001ee:   cc  int3
  810001ef:   cc  int3

  810001f0 <__startup_64>:
  ...

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Heiko Carstens 
Cc: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Ross Zwisler 
Cc: Segher Boessenkool 
Cc: Thomas Gleixner 
Cc: Thomas Lendacky 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-30-keesc...@chromium.org
---
 arch/x86/kernel/vmlinux.lds.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index b06d6e1..3a1a819 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -144,7 +144,7 @@ SECTIONS
*(.text.__x86.indirect_thunk)
__indirect_thunk_end = .;
 #endif
-   } :text = 0x9090
+   } :text =0x
 
/* End of text section, which should occupy whole number of pages */
_etext = .;

[tip: x86/build] powerpc: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 4e9e559a0385930649c1c9cad703d475ee030206
Gitweb:
https://git.kernel.org/tip/4e9e559a0385930649c1c9cad703d475ee030206
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:46 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 18:30:13 +01:00

powerpc: Move EXCEPTION_TABLE to RO_DATA segment

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-25-keesc...@chromium.org
---
 arch/powerpc/kernel/vmlinux.lds.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/powerpc/kernel/vmlinux.lds.S 
b/arch/powerpc/kernel/vmlinux.lds.S
index 4e7cec0..8834220 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -7,6 +7,7 @@
 
 #define BSS_FIRST_SECTIONS *(.bss.prominit)
 #define EMITS_PT_NOTE
+#define RO_EXCEPTION_TABLE_ALIGN   0
 
 #include 
 #include 
@@ -162,7 +163,6 @@ SECTIONS
__stop__btb_flush_fixup = .;
}
 #endif
-   EXCEPTION_TABLE(0)
 
 /*
  * Init sections discarded at runtime

[tip: x86/build] s390: Move RO_DATA into "text" PT_LOAD Program Header

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 6434efbd9aefa3786b446c8e4745d1f49d2983b4
Gitweb:
https://git.kernel.org/tip/6434efbd9aefa3786b446c8e4745d1f49d2983b4
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:28 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:34:32 +01:00

s390: Move RO_DATA into "text" PT_LOAD Program Header

In preparation for moving NOTES into RO_DATA, move RO_DATA back into the
"text" PT_LOAD Program Header, as done with other architectures. The
"data" PT_LOAD now starts with the writable data section.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Heiko Carstens 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-7-keesc...@chromium.org
---
 arch/s390/kernel/vmlinux.lds.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 7e0eb40..13294fe 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -52,7 +52,7 @@ SECTIONS
 
NOTES :text :note
 
-   .dummy : { *(.dummy) } :data
+   .dummy : { *(.dummy) } :text
 
RO_DATA_SECTION(PAGE_SIZE)
 
@@ -64,7 +64,7 @@ SECTIONS
.data..ro_after_init : {
 *(.data..ro_after_init)
JUMP_TABLE_DATA
-   }
+   } :data
EXCEPTION_TABLE(16)
. = ALIGN(PAGE_SIZE);
__end_ro_after_init = .;

[tip: x86/build] vmlinux.lds.h: Move Program Header restoration into NOTES macro

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: fbe6a8e618a2d70621cff277e24f6eb338d3d149
Gitweb:
https://git.kernel.org/tip/fbe6a8e618a2d70621cff277e24f6eb338d3d149
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:31 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:34:39 +01:00

vmlinux.lds.h: Move Program Header restoration into NOTES macro

In preparation for moving NOTES into RO_DATA, make the Program Header
assignment restoration be part of the NOTES macro itself.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Heiko Carstens  # s390
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-10-keesc...@chromium.org
---
 arch/alpha/kernel/vmlinux.lds.S   |  5 +
 arch/ia64/kernel/vmlinux.lds.S|  4 +---
 arch/mips/kernel/vmlinux.lds.S|  3 +--
 arch/powerpc/kernel/vmlinux.lds.S |  4 +---
 arch/s390/kernel/vmlinux.lds.S|  4 +---
 arch/x86/kernel/vmlinux.lds.S |  3 +--
 include/asm-generic/vmlinux.lds.h | 13 +++--
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 363a60b..cdfdc91 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -34,10 +34,7 @@ SECTIONS
swapper_pg_dir = SWAPPER_PGD;
_etext = .; /* End of text section */
 
-   NOTES :text :note
-   .dummy : {
-   *(.dummy)
-   } :text
+   NOTES
 
RODATA
EXCEPTION_TABLE(16)
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 7cf4958..bfc937e 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -70,9 +70,7 @@ SECTIONS {
/*
 * Read-only data
 */
-   NOTES :text :note   /* put .notes in text and mark in PT_NOTE  */
-   code_continues : {
-   } :text/* switch back to regular program...  */
+   NOTES
 
EXCEPTION_TABLE(16)
 
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 1c95612..6a22f53 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -81,8 +81,7 @@ SECTIONS
__stop___dbe_table = .;
}
 
-   NOTES NOTES_HEADERS
-   .dummy : { *(.dummy) } :text
+   NOTES
 
_sdata = .; /* Start of data section */
RODATA
diff --git a/arch/powerpc/kernel/vmlinux.lds.S 
b/arch/powerpc/kernel/vmlinux.lds.S
index 7e26e20..4f19d81 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -164,9 +164,7 @@ SECTIONS
 #endif
EXCEPTION_TABLE(0)
 
-   NOTES :text :note
-   /* Restore program header away from PT_NOTE. */
-   .dummy : { *(.dummy) } :text
+   NOTES
 
 /*
  * Init sections discarded at runtime
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 646d939..f88eede 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -52,9 +52,7 @@ SECTIONS
_etext = .; /* End of text section */
} :text = 0x0700
 
-   NOTES :text :note
-
-   .dummy : { *(.dummy) } :text
+   NOTES
 
RO_DATA_SECTION(PAGE_SIZE)
 
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 2e18bf5..8be25b0 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -148,8 +148,7 @@ SECTIONS
_etext = .;
} :text = 0x9090
 
-   NOTES :text :note
-   .dummy : { *(.dummy) } :text
+   NOTES
 
EXCEPTION_TABLE(16)
 
diff --git a/include/asm-generic/vmlinux.lds.h 
b/include/asm-generic/vmlinux.lds.h
index f5dd45c..97d4299 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -56,10 +56,18 @@
 
 /*
  * Only some architectures want to have the .notes segment visible in
- * a separate PT_NOTE ELF Program Header.
+ * a separate PT_NOTE ELF Program Header. When this happens, it needs
+ * to be visible in both the kernel text's PT_LOAD and the PT_NOTE
+ * Program Headers. In this case, though, the PT_LOAD needs to be made
+ * the default again so that all the following sections don't also end
+ * up in the PT_NOTE Program Header.
  */
 #ifdef EMITS_PT_NOTE
 #define NOTES_HEADERS  :text :note
+#define NOTES_HEADERS_RESTORE  __restore_ph : { *(.__restore_ph) } :text
+#else
+#define NOTES_HEADERS
+#define NOTES_HEADERS_RESTORE
 #endif
 
 /* Align .

[tip: x86/build] vmlinux.lds.h: Provide EMIT_PT_NOTE to indicate export of .notes

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 441110a547f86a2fd0c40bf04b274853622c53cc
Gitweb:
https://git.kernel.org/tip/441110a547f86a2fd0c40bf04b274853622c53cc
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:30 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:34:38 +01:00

vmlinux.lds.h: Provide EMIT_PT_NOTE to indicate export of .notes

In preparation for moving NOTES into RO_DATA, provide a mechanism for
architectures that want to emit a PT_NOTE Program Header to do so.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Heiko Carstens  # s390
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-9-keesc...@chromium.org
---
 arch/alpha/kernel/vmlinux.lds.S   |  3 +++
 arch/ia64/kernel/vmlinux.lds.S|  2 ++
 arch/mips/kernel/vmlinux.lds.S| 12 ++--
 arch/powerpc/kernel/vmlinux.lds.S |  1 +
 arch/s390/kernel/vmlinux.lds.S|  2 ++
 arch/x86/kernel/vmlinux.lds.S |  2 ++
 include/asm-generic/vmlinux.lds.h |  8 
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index 781090c..363a60b 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -1,4 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0 */
+
+#define EMITS_PT_NOTE
+
 #include 
 #include 
 #include 
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 2c4f23c..7cf4958 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -5,6 +5,8 @@
 #include 
 #include 
 
+#define EMITS_PT_NOTE
+
 #include 
 
 OUTPUT_FORMAT("elf64-ia64-little")
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 33ee0d1..1c95612 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -10,6 +10,11 @@
  */
 #define BSS_FIRST_SECTIONS *(.bss..swapper_pg_dir)
 
+/* Cavium Octeon should not have a separate PT_NOTE Program Header. */
+#ifndef CONFIG_CAVIUM_OCTEON_SOC
+#define EMITS_PT_NOTE
+#endif
+
 #include 
 
 #undef mips
@@ -76,12 +81,7 @@ SECTIONS
__stop___dbe_table = .;
}
 
-#ifdef CONFIG_CAVIUM_OCTEON_SOC
-#define NOTES_HEADER
-#else /* CONFIG_CAVIUM_OCTEON_SOC */
-#define NOTES_HEADER :note
-#endif /* CONFIG_CAVIUM_OCTEON_SOC */
-   NOTES :text NOTES_HEADER
+   NOTES NOTES_HEADERS
.dummy : { *(.dummy) } :text
 
_sdata = .; /* Start of data section */
diff --git a/arch/powerpc/kernel/vmlinux.lds.S 
b/arch/powerpc/kernel/vmlinux.lds.S
index e184a63..7e26e20 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -6,6 +6,7 @@
 #endif
 
 #define BSS_FIRST_SECTIONS *(.bss.prominit)
+#define EMITS_PT_NOTE
 
 #include 
 #include 
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index 13294fe..646d939 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -15,6 +15,8 @@
 /* Handle ro_after_init data on our own. */
 #define RO_AFTER_INIT_DATA
 
+#define EMITS_PT_NOTE
+
 #include 
 #include 
 
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 788e789..2e18bf5 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -21,6 +21,8 @@
 #define LOAD_OFFSET __START_KERNEL_map
 #endif
 
+#define EMITS_PT_NOTE
+
 #include 
 #include 
 #include 
diff --git a/include/asm-generic/vmlinux.lds.h 
b/include/asm-generic/vmlinux.lds.h
index dae6460..f5dd45c 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -54,6 +54,14 @@
 #define LOAD_OFFSET 0
 #endif
 
+/*
+ * Only some architectures want to have the .notes segment visible in
+ * a separate PT_NOTE ELF Program Header.
+ */
+#ifdef EMITS_PT_NOTE
+#define NOTES_HEADERS  :text :note
+#endif
+
 /* Align . to a 8 byte boundary equals to maximum function alignment. */
 #define ALIGN_FUNCTION()  . = ALIGN(8)

[tip: x86/build] powerpc: Remove PT_NOTE workaround

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 6fc4000656a10fb679ab6566dcd516ee672f1706
Gitweb:
https://git.kernel.org/tip/6fc4000656a10fb679ab6566dcd516ee672f1706
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:24 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:33:39 +01:00

powerpc: Remove PT_NOTE workaround

In preparation for moving NOTES into RO_DATA, remove the PT_NOTE
workaround since the kernel requires at least gcc 4.6 now.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Michael Ellerman 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x...@kernel.org
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-3-keesc...@chromium.org
---
 arch/powerpc/kernel/vmlinux.lds.S | 24 ++--
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/arch/powerpc/kernel/vmlinux.lds.S 
b/arch/powerpc/kernel/vmlinux.lds.S
index 81e6726..a3c8492 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -20,20 +20,6 @@ ENTRY(_stext)
 PHDRS {
kernel PT_LOAD FLAGS(7); /* RWX */
note PT_NOTE FLAGS(0);
-   dummy PT_NOTE FLAGS(0);
-
-   /* binutils < 2.18 has a bug that makes it misbehave when taking an
-  ELF file with all segments at load address 0 as input.  This
-  happens when running "strip" on vmlinux, because of the AT() magic
-  in this linker script.  People using GCC >= 4.2 won't run into
-  this problem, because the "build-id" support will put some data
-  into the "notes" segment (at a non-zero load address).
-
-  To work around this, we force some data into both the "dummy"
-  segment and the kernel segment, so the dummy segment will get a
-  non-zero load address.  It's not enough to always create the
-  "notes" segment, since if nothing gets assigned to it, its load
-  address will be zero.  */
 }
 
 #ifdef CONFIG_PPC64
@@ -178,14 +164,8 @@ SECTIONS
EXCEPTION_TABLE(0)
 
NOTES :kernel :note
-
-   /* The dummy segment contents for the bug workaround mentioned above
-  near PHDRS.  */
-   .dummy : AT(ADDR(.dummy) - LOAD_OFFSET) {
-   LONG(0)
-   LONG(0)
-   LONG(0)
-   } :kernel :dummy
+   /* Restore program header away from PT_NOTE. */
+   .dummy : { *(.dummy) } :kernel
 
 /*
  * Init sections discarded at runtime

[tip: x86/build] alpha: Rename PT_LOAD identifier "kernel" to "text"

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 65182e6e36195fbf9340808ac4a00d1c146bc05c
Gitweb:
https://git.kernel.org/tip/65182e6e36195fbf9340808ac4a00d1c146bc05c
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:26 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:34:17 +01:00

alpha: Rename PT_LOAD identifier "kernel" to "text"

In preparation for moving NOTES into RO_DATA, rename the linker script
internal identifier for the PT_LOAD Program Header from "kernel" to
"text" to match other architectures.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Heiko Carstens 
Cc: Ivan Kokshaysky 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Matt Turner 
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Richard Henderson 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-5-keesc...@chromium.org
---
 arch/alpha/kernel/vmlinux.lds.S | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index c4b5cec..781090c 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -8,7 +8,7 @@
 OUTPUT_FORMAT("elf64-alpha")
 OUTPUT_ARCH(alpha)
 ENTRY(__start)
-PHDRS { kernel PT_LOAD; note PT_NOTE; }
+PHDRS { text PT_LOAD; note PT_NOTE; }
 jiffies = jiffies_64;
 SECTIONS
 {
@@ -27,14 +27,14 @@ SECTIONS
LOCK_TEXT
*(.fixup)
*(.gnu.warning)
-   } :kernel
+   } :text
swapper_pg_dir = SWAPPER_PGD;
_etext = .; /* End of text section */
 
-   NOTES :kernel :note
+   NOTES :text :note
.dummy : {
*(.dummy)
-   } :kernel
+   } :text
 
RODATA
EXCEPTION_TABLE(16)

[tip: x86/build] powerpc: Rename PT_LOAD identifier "kernel" to "text"

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: af0f3e9e205c3d1bad91ad83e06bfd04df9712b2
Gitweb:
https://git.kernel.org/tip/af0f3e9e205c3d1bad91ad83e06bfd04df9712b2
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:25 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:34:11 +01:00

powerpc: Rename PT_LOAD identifier "kernel" to "text"

In preparation for moving NOTES into RO_DATA, rename the linker script
internal identifier for the PT_LOAD Program Header from "kernel" to
"text" to match other architectures.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Michael Ellerman 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x...@kernel.org
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-4-keesc...@chromium.org
---
 arch/powerpc/kernel/vmlinux.lds.S | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/kernel/vmlinux.lds.S 
b/arch/powerpc/kernel/vmlinux.lds.S
index a3c8492..e184a63 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -18,7 +18,7 @@
 ENTRY(_stext)
 
 PHDRS {
-   kernel PT_LOAD FLAGS(7); /* RWX */
+   text PT_LOAD FLAGS(7); /* RWX */
note PT_NOTE FLAGS(0);
 }
 
@@ -63,7 +63,7 @@ SECTIONS
 #else /* !CONFIG_PPC64 */
HEAD_TEXT
 #endif
-   } :kernel
+   } :text
 
__head_end = .;
 
@@ -112,7 +112,7 @@ SECTIONS
__got2_end = .;
 #endif /* CONFIG_PPC32 */
 
-   } :kernel
+   } :text
 
. = ALIGN(ETEXT_ALIGN_SIZE);
_etext = .;
@@ -163,9 +163,9 @@ SECTIONS
 #endif
EXCEPTION_TABLE(0)
 
-   NOTES :kernel :note
+   NOTES :text :note
/* Restore program header away from PT_NOTE. */
-   .dummy : { *(.dummy) } :kernel
+   .dummy : { *(.dummy) } :text
 
 /*
  * Init sections discarded at runtime
@@ -180,7 +180,7 @@ SECTIONS
 #ifdef CONFIG_PPC64
*(.tramp.ftrace.init);
 #endif
-   } :kernel
+   } :text
 
/* .exit.text is discarded at runtime, not link time,
 * to deal with references from __bug_table

[tip: x86/build] powerpc: Rename "notes" PT_NOTE to "note"

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: ec556271bbb33809b73cdb238f8cb357345908e8
Gitweb:
https://git.kernel.org/tip/ec556271bbb33809b73cdb238f8cb357345908e8
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:23 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:33:28 +01:00

powerpc: Rename "notes" PT_NOTE to "note"

The Program Header identifiers are internal to the linker scripts. In
preparation for moving the NOTES segment declaration into RO_DATA,
standardize the identifier for the PT_NOTE entry to "note" as used by
all other architectures that emit PT_NOTE.

Note that there was discussion about changing all architectures to use
"notes" instead, but I prefer to avoid that at this time. Changing only
powerpc is the smallest change to standardize the entire kernel. And
while this standardization does use singular "note" for a section that
has more than one note in it, this is just an internal identifier. It
matches the ELF "PT_NOTE", and is 4 characters (like "text", and "data")
for pretty alignment. The more exposed macro, "NOTES", use the more
sensible plural wording.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Michael Ellerman 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-2-keesc...@chromium.org
---
 arch/powerpc/kernel/vmlinux.lds.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/powerpc/kernel/vmlinux.lds.S 
b/arch/powerpc/kernel/vmlinux.lds.S
index 060a1ac..81e6726 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -19,7 +19,7 @@ ENTRY(_stext)
 
 PHDRS {
kernel PT_LOAD FLAGS(7); /* RWX */
-   notes PT_NOTE FLAGS(0);
+   note PT_NOTE FLAGS(0);
dummy PT_NOTE FLAGS(0);
 
/* binutils < 2.18 has a bug that makes it misbehave when taking an
@@ -177,7 +177,7 @@ SECTIONS
 #endif
EXCEPTION_TABLE(0)
 
-   NOTES :kernel :notes
+   NOTES :kernel :note
 
/* The dummy segment contents for the bug workaround mentioned above
   near PHDRS.  */

[tip: x86/build] vmlinux.lds.h: Replace RW_DATA_SECTION with RW_DATA

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: c9174047b48d700a785b633319dd7d27288b86be
Gitweb:
https://git.kernel.org/tip/c9174047b48d700a785b633319dd7d27288b86be
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:35 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:57:41 +01:00

vmlinux.lds.h: Replace RW_DATA_SECTION with RW_DATA

Rename RW_DATA_SECTION to RW_DATA. (Calling this a "section" is a lie,
since it's multiple sections and section flags cannot be applied to
the macro.)

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Heiko Carstens  # s390
Acked-by: Geert Uytterhoeven  # m68k
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-14-keesc...@chromium.org
---
 arch/alpha/kernel/vmlinux.lds.S  | 2 +-
 arch/arc/kernel/vmlinux.lds.S| 2 +-
 arch/arm/kernel/vmlinux-xip.lds.S| 2 +-
 arch/arm/kernel/vmlinux.lds.S| 2 +-
 arch/arm64/kernel/vmlinux.lds.S  | 2 +-
 arch/csky/kernel/vmlinux.lds.S   | 2 +-
 arch/h8300/kernel/vmlinux.lds.S  | 2 +-
 arch/hexagon/kernel/vmlinux.lds.S| 2 +-
 arch/m68k/kernel/vmlinux-nommu.lds   | 2 +-
 arch/m68k/kernel/vmlinux-std.lds | 2 +-
 arch/m68k/kernel/vmlinux-sun3.lds| 2 +-
 arch/microblaze/kernel/vmlinux.lds.S | 2 +-
 arch/nds32/kernel/vmlinux.lds.S  | 2 +-
 arch/nios2/kernel/vmlinux.lds.S  | 2 +-
 arch/openrisc/kernel/vmlinux.lds.S   | 2 +-
 arch/parisc/kernel/vmlinux.lds.S | 2 +-
 arch/riscv/kernel/vmlinux.lds.S  | 2 +-
 arch/s390/kernel/vmlinux.lds.S   | 2 +-
 arch/sh/kernel/vmlinux.lds.S | 2 +-
 arch/sparc/kernel/vmlinux.lds.S  | 2 +-
 arch/unicore32/kernel/vmlinux.lds.S  | 2 +-
 arch/xtensa/kernel/vmlinux.lds.S | 2 +-
 include/asm-generic/vmlinux.lds.h| 4 ++--
 23 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index af41181..edc45f4 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -50,7 +50,7 @@ SECTIONS
 
_sdata = .; /* Start of rw data section */
_data = .;
-   RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+   RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
 
.got : {
*(.got)
diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S
index 7d1d270..54139a6 100644
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -101,7 +101,7 @@ SECTIONS
 * 1. this is .data essentially
 * 2. THREAD_SIZE for init.task, must be kernel-stk sz aligned
 */
-   RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+   RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
 
_edata = .;
 
diff --git a/arch/arm/kernel/vmlinux-xip.lds.S 
b/arch/arm/kernel/vmlinux-xip.lds.S
index d2a9651..21b8b27 100644
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -112,7 +112,7 @@ SECTIONS
 
. = ALIGN(THREAD_SIZE);
_sdata = .;
-   RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+   RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
.data.ro_after_init : AT(ADDR(.data.ro_after_init) - LOAD_OFFSET) {
*(.data..ro_after_init)
}
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 068db68..319ccb1 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -141,7 +141,7 @@ SECTIONS
__init_end = .;
 
_sdata = .;
-   RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+   RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
_edata = .;
 
BSS_SECTION(0, 0, 0)
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index e7dafc2..a4b3e6c 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -214,7 +214,7 @@ SECTIONS
 
_data = .;
_sdata = .;
-   RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_ALIGN)
+   RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_ALIGN)
 
/*
 * Data written with the MMU off but read with the MMU on requires
diff --git a/arch/csky/kernel/vmlinux.lds.S b/arch/csky/kernel/vmlinux.lds.S
index 8598bd7..2ff37be 100644
--- a/arch/csky/kernel/vmlinux.lds.S
+++ b/arch/csky/kernel/vmlinux.lds.S
@@ -50,7 +50,7 @@ SECTIONS
 
_sdata = .;
RO_DATA(PAGE_SIZE)
-   RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
+   RW_DATA(L1_CACHE_BYTES, PAGE_SIZE,

[tip: x86/build] ia64: Rename PT_LOAD identifier "code" to "text"

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 430c6b2647e215c4129f36646ad28a725996b410
Gitweb:
https://git.kernel.org/tip/430c6b2647e215c4129f36646ad28a725996b410
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:27 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:34:29 +01:00

ia64: Rename PT_LOAD identifier "code" to "text"

In preparation for moving NOTES into RO_DATA, rename the linker script
internal identifier for the PT_LOAD Program Header from "code" to "text"
to match other architectures.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Fenghua Yu 
Cc: Heiko Carstens 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Tony Luck 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-6-keesc...@chromium.org
---
 arch/ia64/kernel/vmlinux.lds.S | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index d9d4e21..2c4f23c 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -13,7 +13,7 @@ ENTRY(phys_start)
 jiffies = jiffies_64;
 
 PHDRS {
-   code   PT_LOAD;
+   text   PT_LOAD;
percpu PT_LOAD;
data   PT_LOAD;
note   PT_NOTE;
@@ -36,7 +36,7 @@ SECTIONS {
phys_start = _start - LOAD_OFFSET;
 
code : {
-   } :code
+   } :text
. = KERNEL_START;
 
_text = .;
@@ -68,9 +68,9 @@ SECTIONS {
/*
 * Read-only data
 */
-   NOTES :code :note   /* put .notes in text and mark in PT_NOTE  */
+   NOTES :text :note   /* put .notes in text and mark in PT_NOTE  */
code_continues : {
-   } : code   /* switch back to regular program...  */
+   } :text/* switch back to regular program...  */
 
EXCEPTION_TABLE(16)
 
@@ -102,9 +102,9 @@ SECTIONS {
__start_unwind = .;
*(.IA_64.unwind*)
__end_unwind = .;
-   } :code :unwind
+   } :text :unwind
code_continues2 : {
-   } : code
+   } :text
 
RODATA
 
@@ -214,7 +214,7 @@ SECTIONS {
_end = .;
 
code : {
-   } :code
+   } :text
 
STABS_DEBUG
DWARF_DEBUG

[tip: x86/build] vmlinux.lds.h: Replace RO_DATA_SECTION with RO_DATA

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 93240b327929ff03c1878ea8badc5c6bd86f053f
Gitweb:
https://git.kernel.org/tip/93240b327929ff03c1878ea8badc5c6bd86f053f
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:34 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:56:16 +01:00

vmlinux.lds.h: Replace RO_DATA_SECTION with RO_DATA

Finish renaming RO_DATA_SECTION to RO_DATA. (Calling this a "section"
is a lie, since it's multiple sections and section flags cannot be
applied to the macro.)

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Heiko Carstens  # s390
Acked-by: Geert Uytterhoeven  # m68k
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-13-keesc...@chromium.org
---
 arch/arc/kernel/vmlinux.lds.S   | 2 +-
 arch/c6x/kernel/vmlinux.lds.S   | 2 +-
 arch/csky/kernel/vmlinux.lds.S  | 2 +-
 arch/h8300/kernel/vmlinux.lds.S | 2 +-
 arch/hexagon/kernel/vmlinux.lds.S   | 2 +-
 arch/m68k/kernel/vmlinux-nommu.lds  | 2 +-
 arch/nds32/kernel/vmlinux.lds.S | 2 +-
 arch/nios2/kernel/vmlinux.lds.S | 2 +-
 arch/openrisc/kernel/vmlinux.lds.S  | 4 ++--
 arch/parisc/kernel/vmlinux.lds.S| 4 ++--
 arch/riscv/kernel/vmlinux.lds.S | 2 +-
 arch/s390/kernel/vmlinux.lds.S  | 2 +-
 arch/unicore32/kernel/vmlinux.lds.S | 2 +-
 include/asm-generic/vmlinux.lds.h   | 7 ++-
 14 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S
index 1d6eef4..7d1d270 100644
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -95,7 +95,7 @@ SECTIONS
_etext = .;
 
_sdata = .;
-   RO_DATA_SECTION(PAGE_SIZE)
+   RO_DATA(PAGE_SIZE)
 
/*
 * 1. this is .data essentially
diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S
index d6e3802..a3547f9 100644
--- a/arch/c6x/kernel/vmlinux.lds.S
+++ b/arch/c6x/kernel/vmlinux.lds.S
@@ -82,7 +82,7 @@ SECTIONS
 
EXCEPTION_TABLE(16)
 
-   RO_DATA_SECTION(PAGE_SIZE)
+   RO_DATA(PAGE_SIZE)
.const :
{
*(.const .const.* .gnu.linkonce.r.*)
diff --git a/arch/csky/kernel/vmlinux.lds.S b/arch/csky/kernel/vmlinux.lds.S
index 75dd314..8598bd7 100644
--- a/arch/csky/kernel/vmlinux.lds.S
+++ b/arch/csky/kernel/vmlinux.lds.S
@@ -49,7 +49,7 @@ SECTIONS
 
 
_sdata = .;
-   RO_DATA_SECTION(PAGE_SIZE)
+   RO_DATA(PAGE_SIZE)
RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
_edata = .;
 
diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
index 88776e7..d3247d3 100644
--- a/arch/h8300/kernel/vmlinux.lds.S
+++ b/arch/h8300/kernel/vmlinux.lds.S
@@ -38,7 +38,7 @@ SECTIONS
_etext = . ;
}
EXCEPTION_TABLE(16)
-   RO_DATA_SECTION(4)
+   RO_DATA(4)
ROMEND = .;
 #if defined(CONFIG_ROMKERNEL)
. = RAMTOP;
diff --git a/arch/hexagon/kernel/vmlinux.lds.S 
b/arch/hexagon/kernel/vmlinux.lds.S
index 6a6e8fc..0145251 100644
--- a/arch/hexagon/kernel/vmlinux.lds.S
+++ b/arch/hexagon/kernel/vmlinux.lds.S
@@ -50,7 +50,7 @@ SECTIONS
 
_sdata = .;
RW_DATA_SECTION(32,PAGE_SIZE,_THREAD_SIZE)
-   RO_DATA_SECTION(PAGE_SIZE)
+   RO_DATA(PAGE_SIZE)
_edata = .;
 
EXCEPTION_TABLE(16)
diff --git a/arch/m68k/kernel/vmlinux-nommu.lds 
b/arch/m68k/kernel/vmlinux-nommu.lds
index cf6edda..de80f8b 100644
--- a/arch/m68k/kernel/vmlinux-nommu.lds
+++ b/arch/m68k/kernel/vmlinux-nommu.lds
@@ -60,7 +60,7 @@ SECTIONS {
 #endif
 
_sdata = .;
-   RO_DATA_SECTION(PAGE_SIZE)
+   RO_DATA(PAGE_SIZE)
RW_DATA_SECTION(16, PAGE_SIZE, THREAD_SIZE)
_edata = .;
 
diff --git a/arch/nds32/kernel/vmlinux.lds.S b/arch/nds32/kernel/vmlinux.lds.S
index c4f1c5a..10ff570 100644
--- a/arch/nds32/kernel/vmlinux.lds.S
+++ b/arch/nds32/kernel/vmlinux.lds.S
@@ -53,7 +53,7 @@ SECTIONS
_etext = .; /* End of text and rodata section */
 
_sdata = .;
-   RO_DATA_SECTION(PAGE_SIZE)
+   RO_DATA(PAGE_SIZE)
RW_DATA_SECTION(L1_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
_edata  =  .;
 
diff --git a/arch/nios2/kernel/vmlinux.lds.S b/arch/nios2/kernel/vmlinux.lds.S
index 20e4078..318804a 100644
--- a/arch/nios2/kernel/vmlinux.lds.S
+++ b/arch/nios2/kernel/vmlinux.lds.S
@@ -49,7 +49,7 @@ SECTIONS
__init_end = .;
 
_sdata = .;
-   RO_DATA_SECTION(PAGE_SIZE)
+

[tip: x86/build] microblaze: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: 3bda6f37a7949c803b84cf27e11a3995d900a179
Gitweb:
https://git.kernel.org/tip/3bda6f37a7949c803b84cf27e11a3995d900a179
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:44 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 18:18:23 +01:00

microblaze: Move EXCEPTION_TABLE to RO_DATA segment

Since the EXCEPTION_TABLE is read-only, collapse it into RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Geert Uytterhoeven 
Cc: Heiko Carstens 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-23-keesc...@chromium.org
---
 arch/microblaze/kernel/vmlinux.lds.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/microblaze/kernel/vmlinux.lds.S 
b/arch/microblaze/kernel/vmlinux.lds.S
index b8efb08..760cac4 100644
--- a/arch/microblaze/kernel/vmlinux.lds.S
+++ b/arch/microblaze/kernel/vmlinux.lds.S
@@ -11,6 +11,8 @@
 OUTPUT_ARCH(microblaze)
 ENTRY(microblaze_start)
 
+#define RO_EXCEPTION_TABLE_ALIGN   16
+
 #include 
 #include 
 #include 
@@ -52,7 +54,6 @@ SECTIONS {
 
. = ALIGN(16);
RO_DATA(4096)
-   EXCEPTION_TABLE(16)
 
/*
 * sdata2 section can go anywhere, but must be word aligned

[tip: x86/build] vmlinux.lds.h: Allow EXCEPTION_TABLE to live in RO_DATA

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: b8c2f776164c8f74ac31c5e370ca3f029be0aa19
Gitweb:
https://git.kernel.org/tip/b8c2f776164c8f74ac31c5e370ca3f029be0aa19
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:36 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:59:01 +01:00

vmlinux.lds.h: Allow EXCEPTION_TABLE to live in RO_DATA

Many architectures have an EXCEPTION_TABLE that needs to be only
readable. As such, it should live in RO_DATA. Create a macro to identify
this case for the architectures that can move EXCEPTION_TABLE into
RO_DATA.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Will Deacon 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-15-keesc...@chromium.org
---
 include/asm-generic/vmlinux.lds.h | 12 
 1 file changed, 12 insertions(+)

diff --git a/include/asm-generic/vmlinux.lds.h 
b/include/asm-generic/vmlinux.lds.h
index 356078e..9867d8e 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -69,6 +69,17 @@
 #define NOTES_HEADERS_RESTORE
 #endif
 
+/*
+ * Some architectures have non-executable read-only exception tables.
+ * They can be added to the RO_DATA segment by specifying their desired
+ * alignment.
+ */
+#ifdef RO_EXCEPTION_TABLE_ALIGN
+#define RO_EXCEPTION_TABLE EXCEPTION_TABLE(RO_EXCEPTION_TABLE_ALIGN)
+#else
+#define RO_EXCEPTION_TABLE
+#endif
+
 /* Align . to a 8 byte boundary equals to maximum function alignment. */
 #define ALIGN_FUNCTION()  . = ALIGN(8)
 
@@ -513,6 +524,7 @@
__stop___modver = .;\
}   \
\
+   RO_EXCEPTION_TABLE  \
NOTES   \
\
. = ALIGN((align)); \

[tip: x86/build] vmlinux.lds.h: Move NOTES into RO_DATA

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: eaf937075c9a42eb8ba51eb3050773d7205d3595
Gitweb:
https://git.kernel.org/tip/eaf937075c9a42eb8ba51eb3050773d7205d3595
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:32 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 15:34:41 +01:00

vmlinux.lds.h: Move NOTES into RO_DATA

The .notes section should be non-executable read-only data. As such,
move it to the RO_DATA macro instead of being per-architecture defined.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Acked-by: Heiko Carstens  # s390
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linux-s...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Segher Boessenkool 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-11-keesc...@chromium.org
---
 arch/alpha/kernel/vmlinux.lds.S  |  2 --
 arch/arc/kernel/vmlinux.lds.S|  2 --
 arch/arm/kernel/vmlinux-xip.lds.S|  2 --
 arch/arm/kernel/vmlinux.lds.S|  2 --
 arch/arm64/kernel/vmlinux.lds.S  |  1 -
 arch/c6x/kernel/vmlinux.lds.S|  1 -
 arch/csky/kernel/vmlinux.lds.S   |  1 -
 arch/h8300/kernel/vmlinux.lds.S  |  1 -
 arch/hexagon/kernel/vmlinux.lds.S|  1 -
 arch/ia64/kernel/vmlinux.lds.S   |  2 --
 arch/microblaze/kernel/vmlinux.lds.S |  1 -
 arch/mips/kernel/vmlinux.lds.S   |  2 --
 arch/nds32/kernel/vmlinux.lds.S  |  1 -
 arch/nios2/kernel/vmlinux.lds.S  |  1 -
 arch/openrisc/kernel/vmlinux.lds.S   |  1 -
 arch/parisc/kernel/vmlinux.lds.S |  1 -
 arch/powerpc/kernel/vmlinux.lds.S|  2 --
 arch/riscv/kernel/vmlinux.lds.S  |  1 -
 arch/s390/kernel/vmlinux.lds.S   |  2 --
 arch/sh/kernel/vmlinux.lds.S |  1 -
 arch/sparc/kernel/vmlinux.lds.S  |  1 -
 arch/um/include/asm/common.lds.S |  1 -
 arch/unicore32/kernel/vmlinux.lds.S  |  1 -
 arch/x86/kernel/vmlinux.lds.S|  2 --
 arch/xtensa/kernel/vmlinux.lds.S |  1 -
 include/asm-generic/vmlinux.lds.h|  9 +
 26 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S
index cdfdc91..bf28043 100644
--- a/arch/alpha/kernel/vmlinux.lds.S
+++ b/arch/alpha/kernel/vmlinux.lds.S
@@ -34,8 +34,6 @@ SECTIONS
swapper_pg_dir = SWAPPER_PGD;
_etext = .; /* End of text section */
 
-   NOTES
-
RODATA
EXCEPTION_TABLE(16)
 
diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S
index 6c693a9..1d6eef4 100644
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -118,8 +118,6 @@ SECTIONS
/DISCARD/ : {   *(.eh_frame) }
 #endif
 
-   NOTES
-
. = ALIGN(PAGE_SIZE);
_end = . ;
 
diff --git a/arch/arm/kernel/vmlinux-xip.lds.S 
b/arch/arm/kernel/vmlinux-xip.lds.S
index 8c74037..d2a9651 100644
--- a/arch/arm/kernel/vmlinux-xip.lds.S
+++ b/arch/arm/kernel/vmlinux-xip.lds.S
@@ -70,8 +70,6 @@ SECTIONS
ARM_UNWIND_SECTIONS
 #endif
 
-   NOTES
-
_etext = .; /* End of text and rodata section */
 
ARM_VECTORS
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index 23150c0..068db68 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -81,8 +81,6 @@ SECTIONS
ARM_UNWIND_SECTIONS
 #endif
 
-   NOTES
-
 #ifdef CONFIG_STRICT_KERNEL_RWX
. = ALIGN(1<

[tip: x86/build] x86/vmlinux: Move EXCEPTION_TABLE to RO_DATA segment

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: f0d7ee17d57c7a8510518a1e60366d053e2f3ff5
Gitweb:
https://git.kernel.org/tip/f0d7ee17d57c7a8510518a1e60366d053e2f3ff5
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:38 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 17:55:02 +01:00

x86/vmlinux: Move EXCEPTION_TABLE to RO_DATA segment

The exception table was needlessly marked executable. In preparation
for execute-only memory, move the table into the RO_DATA segment via
the new macro that can be used by any architectures that want to make
a similar consolidation.

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Heiko Carstens 
Cc: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Ross Zwisler 
Cc: Segher Boessenkool 
Cc: Thomas Gleixner 
Cc: Thomas Lendacky 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-17-keesc...@chromium.org
---
 arch/x86/kernel/vmlinux.lds.S | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index a1a758e..b06d6e1 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -22,6 +22,7 @@
 #endif
 
 #define EMITS_PT_NOTE
+#define RO_EXCEPTION_TABLE_ALIGN   16
 
 #include 
 #include 
@@ -145,8 +146,6 @@ SECTIONS
 #endif
} :text = 0x9090
 
-   EXCEPTION_TABLE(16)
-
/* End of text section, which should occupy whole number of pages */
_etext = .;
. = ALIGN(PAGE_SIZE);

[tip: x86/build] x86/mm: Report actual image regions in /proc/iomem

2019-11-05 Thread tip-bot2 for Kees Cook 
The following commit has been merged into the x86/build branch of tip:

Commit-ID: a329975491aafcb1fb6e2fad0de22cae5c16154f
Gitweb:
https://git.kernel.org/tip/a329975491aafcb1fb6e2fad0de22cae5c16154f
Author:Kees Cook 
AuthorDate:Tue, 29 Oct 2019 14:13:50 -07:00
Committer: Borislav Petkov 
CommitterDate: Mon, 04 Nov 2019 19:02:25 +01:00

x86/mm: Report actual image regions in /proc/iomem

The resource reservations in /proc/iomem made for the kernel image did
not reflect the gaps between text, rodata, and data. Add the "rodata"
resource and update the start/end calculations to match the respective
calls to free_kernel_image_pages().

Before (booted with "nokaslr" for easier comparison):

0010-bffd9fff : System RAM
  0100-01e011d0 : Kernel code
  01e011d1-025619bf : Kernel data
  02a95000-035f : Kernel bss

After:

0010-bffd9fff : System RAM
  0100-01e011d0 : Kernel code
  0200-023d4fff : Kernel rodata
  0240-025619ff : Kernel data
  02a95000-035f : Kernel bss

Signed-off-by: Kees Cook 
Signed-off-by: Borislav Petkov 
Cc: Andy Lutomirski 
Cc: Arnd Bergmann 
Cc: Dave Hansen 
Cc: Dave Young 
Cc: David Howells 
Cc: Heiko Carstens 
Cc: "H. Peter Anvin" 
Cc: Ingo Molnar 
Cc: Juergen Gross 
Cc: linux-al...@vger.kernel.org
Cc: linux-a...@vger.kernel.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-c6x-...@linux-c6x.org
Cc: linux-i...@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-s...@vger.kernel.org
Cc: Michael Ellerman 
Cc: Michal Simek 
Cc: Rick Edgecombe 
Cc: Robert Richter 
Cc: Segher Boessenkool 
Cc: Thomas Gleixner 
Cc: Thomas Lendacky 
Cc: Will Deacon 
Cc: x86-ml 
Cc: Yoshinori Sato 
Link: https://lkml.kernel.org/r/20191029211351.13243-29-keesc...@chromium.org
---
 arch/x86/kernel/setup.c | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 77ea96b..591e885 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -143,6 +143,13 @@ struct boot_params boot_params;
 /*
  * Machine setup..
  */
+static struct resource rodata_resource = {
+   .name   = "Kernel rodata",
+   .start  = 0,
+   .end= 0,
+   .flags  = IORESOURCE_BUSY | IORESOURCE_SYSTEM_RAM
+};
+
 static struct resource data_resource = {
.name   = "Kernel data",
.start  = 0,
@@ -951,7 +958,9 @@ void __init setup_arch(char **cmdline_p)
 
code_resource.start = __pa_symbol(_text);
code_resource.end = __pa_symbol(_etext)-1;
-   data_resource.start = __pa_symbol(_etext);
+   rodata_resource.start = __pa_symbol(__start_rodata);
+   rodata_resource.end = __pa_symbol(__end_rodata)-1;
+   data_resource.start = __pa_symbol(_sdata);
data_resource.end = __pa_symbol(_edata)-1;
bss_resource.start = __pa_symbol(__bss_start);
bss_resource.end = __pa_symbol(__bss_stop)-1;
@@ -1040,6 +1049,7 @@ void __init setup_arch(char **cmdline_p)
 
/* after parse_early_param, so could debug it */
insert_resource(_resource, _resource);
+   insert_resource(_resource, _resource);
insert_resource(_resource, _resource);
insert_resource(_resource, _resource);