ARM: 8583/1: mm: fix location of _etext (14c4a533) · Commits · 戴 / test

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>

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

Admin message