Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16f3e95b authored by Jiri Kosina's avatar Jiri Kosina Committed by Linus Torvalds
Browse files

cross-arch: don't corrupt personality flags upon exec() 



Historically, the top three bytes of personality have been used for
things such as ADDR_NO_RANDOMIZE, which made sense only for specific
architectures.

We now however have a flag there that is general no matter the
architecture (UNAME26); generally we have to be careful to preserve the
personality flags across exec().

This patch tries to fix all architectures that forcefully overwrite
personality flags during exec() (ppc32 and s390 have been fixed recently
by commits f9783ec8 ("[S390] Do not clobber personality flags on
exec") and 59e4c3a2 ("powerpc/32: Don't clobber personality flags on
exec") in a similar way already).

Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Cc: Hans-Christian Egtvedt <egtvedt@samfundet.no>
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Mark Salter <msalter@redhat.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Chen Liqin <liqin.chen@sunplusct.com>
Cc: Lennox Wu <lennox.wu@gmail.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0d118d7f

arch/avr32/include/asm/elf.h

+2 −1
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ typedef struct user_fpu_struct elf_fpregset_t; 


#define ELF_PLATFORM  (NULL)



#define SET_PERSONALITY(ex) set_personality(PER_LINUX_32BIT)

#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK)))



#endif /* __ASM_AVR32_ELF_H */

arch/blackfin/include/asm/elf.h

+2 −1
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ do { \ 


#define ELF_PLATFORM  (NULL)



#define SET_PERSONALITY(ex) set_personality(PER_LINUX)

#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))



#endif

arch/c6x/include/asm/elf.h

+2 −1
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ do { \ 


#define ELF_PLATFORM  (NULL)



#define SET_PERSONALITY(ex) set_personality(PER_LINUX)

#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))



/* C6X specific section types */

#define SHT_C6000_UNWIND	0x70000001

arch/cris/include/asm/elf.h

+2 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ typedef unsigned long elf_fpregset_t; 


#define ELF_PLATFORM  (NULL)



#define SET_PERSONALITY(ex) set_personality(PER_LINUX)

#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))



#endif

arch/frv/include/asm/elf.h

+2 −1
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ do { \ 


#define ELF_PLATFORM  (NULL)



#define SET_PERSONALITY(ex) set_personality(PER_LINUX)

#define SET_PERSONALITY(ex) \

	set_personality(PER_LINUX | (current->personality & (~PER_MASK)))



#endif