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

Commit 9da616fb authored by Makito SHIOKAWA's avatar Makito SHIOKAWA Committed by Russell King
Browse files

[ARM] 5404/1: Fix condition in arm_elf_read_implies_exec() to set READ_IMPLIES_EXEC 



READ_IMPLIES_EXEC must be set when:
o binary _is_ an executable stack (i.e. not EXSTACK_DISABLE_X)
o processor architecture is _under_ ARMv6 (XN bit is supported from ARMv6)

Signed-off-by: default avatarMakito SHIOKAWA <lkhmkt@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 41f3103f

arch/arm/kernel/elf.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -74,9 +74,9 @@ EXPORT_SYMBOL(elf_set_personality); 
 */

 */

int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack)

int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack)

{

{

	if (executable_stack != EXSTACK_ENABLE_X)

	if (executable_stack != EXSTACK_DISABLE_X)

		return 1;

		return 1;

	if (cpu_architecture() <= CPU_ARCH_ARMv6)

	if (cpu_architecture() < CPU_ARCH_ARMv6)

		return 1;

		return 1;

	return 0;

	return 0;

}

}