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

Commit 1c0d52b9 authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

MIPS: Don't clobber personality high bits. 



The high bits of current->personality carry settings that we don't want to
clobber on each exec.  Only clobber them if the lower bits that indicate
either PER_LINUX or PER_LINUX32 are invalid.

The clobbering prevents us from using useful bits like ADDR_NO_RANDOMIZE.

Reported-by: default avatarCamm Maguire <camm@maguirefamily.org>
Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
Cc: Camm Maguire <camm@maguirefamily.org>
Patchwork: https://patchwork.linux-mips.org/patch/1750/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1d210386

arch/mips/include/asm/elf.h

+6 −2
Original line number Original line Diff line number Diff line
@@ -249,6 +249,7 @@ extern struct mips_abi mips_abi_n32; 




#define SET_PERSONALITY(ex)						\

#define SET_PERSONALITY(ex)						\

do {									\

do {									\

	if (personality(current->personality) != PER_LINUX)		\

		set_personality(PER_LINUX);				\

		set_personality(PER_LINUX);				\

									\

									\

	current->thread.abi = &mips_abi;				\

	current->thread.abi = &mips_abi;				\
@@ -296,6 +297,8 @@ do { \ 




#define SET_PERSONALITY(ex)						\

#define SET_PERSONALITY(ex)						\

do {									\

do {									\

	unsigned int p;							\

									\

	clear_thread_flag(TIF_32BIT_REGS);				\

	clear_thread_flag(TIF_32BIT_REGS);				\

	clear_thread_flag(TIF_32BIT_ADDR);				\

	clear_thread_flag(TIF_32BIT_ADDR);				\

									\

									\
@@ -304,7 +307,8 @@ do { \ 
	else								\

	else								\

		current->thread.abi = &mips_abi;			\

		current->thread.abi = &mips_abi;			\

									\

									\

	if (current->personality != PER_LINUX32)			\

	p = personality(current->personality);				\

	if (p != PER_LINUX32 && p != PER_LINUX)				\

		set_personality(PER_LINUX);				\

		set_personality(PER_LINUX);				\

} while (0)

} while (0)