---

yaml --- r: 145395 b: refs/heads/master c: 14f0aa3 h: refs/heads/master i: 145393: a1584b9 145391: be9daa4 v: v3
git-mirror · May 23, 2009 · ce4af25 · ce4af25
1 parent 4843632
commit ce4af25
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 355532bdda14a7162cee55fdd67600bf9bc9a152
+refs/heads/master: 14f0aa359365e8a93a77b71e3b840274b9b4dcb1
diff --git a/trunk/arch/arm/kernel/elf.c b/trunk/arch/arm/kernel/elf.c
@@ -78,6 +78,15 @@ int arm_elf_read_implies_exec(const struct elf32_hdr *x, int executable_stack)
 		return 1;
 	if (cpu_architecture() < CPU_ARCH_ARMv6)
 		return 1;
+#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
+	/*
+	 * If we have support for OABI programs, we can never allow NX
+	 * support - our signal syscall restart mechanism relies upon
+	 * being able to execute code placed on the user stack.
+	 */
+	return 1;
+#else
 	return 0;
+#endif
 }
 EXPORT_SYMBOL(arm_elf_read_implies_exec);