Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 14c4a533 authored by Kees Cook's avatar Kees Cook Committed by Russell King
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 520319de

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/arm/kernel/vmlinux.lds.S

+2 −2
Original line number Diff line number Diff line
@@ -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