[PATCH] ppc64: noexec fixes

[Anton Blanchard]

Hi,

There were a few issues with the ppc64 noexec support:

The 64bit ABI has a non executable stack by default. At the moment 64bit
apps require a PT_GNU_STACK section in order to have a non executable stack.

Disable the read implies exec workaround on the 64bit ABI. The 64bit
toolchain has never had problems with incorrect mmap permissions (the
32bit has, thats why we need to retain the workaround).

With these fixes as well as a gcc fix from Alan Modra (that was recently
committed) 64bit apps work as expected.

Signed-off-by: Anton Blanchard <anton at samba.org>

Index: linux-2.6.12-rc2/include/asm-ppc64/page.h
===================================================================
--- linux-2.6.12-rc2.orig/include/asm-ppc64/page.h	2005-04-26 17:05:20.466826509 +1000
+++ linux-2.6.12-rc2/include/asm-ppc64/page.h	2005-04-26 17:05:56.628140917 +1000
@@ -252,10 +252,19 @@
 
 /*
  * This is the default if a program doesn't have a PT_GNU_STACK
- * program header entry.
+ * program header entry. The PPC64 ELF ABI has a non executable stack
+ * stack by default, so in the absense of a PT_GNU_STACK program header
+ * we turn execute permission off.
  */
-#define VM_STACK_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \
-				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+#define VM_STACK_DEFAULT_FLAGS32	(VM_READ | VM_WRITE | VM_EXEC | \
+					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
+#define VM_STACK_DEFAULT_FLAGS64	(VM_READ | VM_WRITE | \
+					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
+#define VM_STACK_DEFAULT_FLAGS \
+	(test_thread_flag(TIF_32BIT) ? \
+	 VM_STACK_DEFAULT_FLAGS32 : VM_STACK_DEFAULT_FLAGS64)
 
 #endif /* __KERNEL__ */
 #endif /* _PPC64_PAGE_H */
Index: linux-2.6.12-rc2/include/asm-ppc64/elf.h
===================================================================
--- linux-2.6.12-rc2.orig/include/asm-ppc64/elf.h	2005-04-26 17:05:20.467826175 +1000
+++ linux-2.6.12-rc2/include/asm-ppc64/elf.h	2005-04-26 17:05:56.631139914 +1000
@@ -229,9 +229,13 @@
 
 /*
  * An executable for which elf_read_implies_exec() returns TRUE will
- * have the READ_IMPLIES_EXEC personality flag set automatically.
+ * have the READ_IMPLIES_EXEC personality flag set automatically. This
+ * is only required to work around bugs in old 32bit toolchains. Since
+ * the 64bit ABI has never had these issues dont enable the workaround
+ * even if we have an executable stack.
  */
-#define elf_read_implies_exec(ex, exec_stk)	(exec_stk != EXSTACK_DISABLE_X)
+#define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \
+		(exec_stk != EXSTACK_DISABLE_X) : 0)
 
 #endif