[PATCH] ARM: mm: fix location of _etext

From: Kees Cook
Date: Wed Jun 08 2016 - 19:12:06 EST


The _etext position is defined to be the end of the kernel text code,
and should not include any part of the data segments. This interferes
with things that might check memory ranges and expect executable code
up to _etext.

Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx>
---
arm64 needs this fixed too, but it has other assumptions built onto
_etext that should be using different markers.
---
arch/arm/kernel/vmlinux.lds.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
index e2c6da096cef..99420fc1f066 100644
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@ -125,6 +125,8 @@ SECTIONS
#ifdef CONFIG_DEBUG_ALIGN_RODATA
. = ALIGN(1<<SECTION_SHIFT);
#endif
+ _etext = .; /* End of text section */
+
RO_DATA(PAGE_SIZE)

. = ALIGN(4);
@@ -155,8 +157,6 @@ SECTIONS

NOTES

- _etext = .; /* End of text and rodata section */
-
#ifdef CONFIG_DEBUG_RODATA
. = ALIGN(1<<SECTION_SHIFT);
#else
--
2.7.4


--
Kees Cook
Chrome OS & Brillo Security