diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 12:36:20 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 12:36:20 +0200 |
| commit | 14f0aa359365e8a93a77b71e3b840274b9b4dcb1 (patch) | |
| tree | 30493ede1ced950b084c9c9083e6ee28803fc5a5 | |
| parent | Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px... (diff) | |
| download | linux-14f0aa359365e8a93a77b71e3b840274b9b4dcb1.tar.xz linux-14f0aa359365e8a93a77b71e3b840274b9b4dcb1.zip | |
[ARM] disable NX support for OABI-supporting kernels
Our signal syscall restart handling for these kernels still uses
the userspace stack to build code for restarting the syscall.
Unfortunately, fixing this is non-trivial, and so for the time
being, we resolve the problem by disabling NX support.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/kernel/elf.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/kernel/elf.c b/arch/arm/kernel/elf.c index d4a0da1e48f4..950391f194c4 100644 --- a/arch/arm/kernel/elf.c +++ b/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); |