ARM: 8583/1: mm: fix location of _etext

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. Just to be conservative, leave the kernel resource as
it was, using __init_begin instead of _etext as the end mark.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 7b5350060612..dd84f03dc2d4 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -844,7 +844,7 @@ static void __init request_standard_resources(const struct machine_desc *mdesc)
         struct resource *res;
 
         kernel_code.start   = virt_to_phys(_text);
-        kernel_code.end     = virt_to_phys(_etext - 1);
+        kernel_code.end     = virt_to_phys(__init_begin - 1);
         kernel_data.start   = virt_to_phys(_sdata);
         kernel_data.end     = virt_to_phys(_end - 1);
 
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