summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorMakito SHIOKAWA <lkhmkt@gmail.com>2009-02-19 15:34:59 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-02-19 14:45:27 +0000
commit9da616fb9946c8d65387052e5a538b8f54ddb292 (patch)
tree91fa682e64047f197a2d9f55713d6df2a8a38cf8 /arch/arm
parent41f3103fcfffff096c34f5267d7c9a26b44d89d3 (diff)
[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: Makito SHIOKAWA <lkhmkt@gmail.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/elf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c
index 84849098c8e8..d4a0da1e48f4 100644
--- a/arch/arm/kernel/elf.c
+++ b/arch/arm/kernel/elf.c
@@ -74,9 +74,9 @@ EXPORT_SYMBOL(elf_set_personality);
*/
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;
- if (cpu_architecture() <= CPU_ARCH_ARMv6)
+ if (cpu_architecture() < CPU_ARCH_ARMv6)
return 1;
return 0;
}