powerpc/32: Don't clobber personality flags on exec
authorAndreas Schwab <schwab@linux-m68k.org>
Thu, 16 Apr 2009 06:22:01 +0000 (06:22 +0000)
committerPaul Mackerras <paulus@samba.org>
Wed, 22 Apr 2009 04:56:34 +0000 (14:56 +1000)
Now that ppc32 implements address randomization it also wants to inherit
personality flags like ADDR_NO_RANDOMIZE across exec, for things like
`setarch ppc -R' to work.  But the ppc32 version of SET_PERSONALITY
forcefully sets PER_LINUX, clearing all personality flags.  So be
careful about preserving the flags.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/include/asm/elf.h

index 1a856b15226e70e1c40f7b4d8d2f347c19cc2af8..087c22f1d3681328ffef059283d7b8d78ae9bc48 100644 (file)
@@ -258,7 +258,8 @@ do {                                                                \
 # define elf_read_implies_exec(ex, exec_stk) (test_thread_flag(TIF_32BIT) ? \
                (exec_stk != EXSTACK_DISABLE_X) : 0)
 #else 
-# define SET_PERSONALITY(ex) set_personality(PER_LINUX)
+# define SET_PERSONALITY(ex) \
+  set_personality(PER_LINUX | (current->personality & (~PER_MASK)))
 #endif /* __powerpc64__ */
 
 extern int dcache_bsize;