Patchwork [RESEND] powerpc: fix personality handling in ppc64_personality()

login
register
mail settings
Submitter Jiri Kosina
Date Aug. 13, 2012, 1:18 p.m.
Message ID <alpine.LNX.2.00.1208131515550.29827@pobox.suse.cz>
Download mbox | patch
Permalink /patch/176938/
State Accepted, archived
Commit 7256a5d2da56f2ea8ad49e8dbe9e2984f0899b42
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Jiri Kosina - Aug. 13, 2012, 1:18 p.m.
Directly comparing current->personality against PER_LINUX32 doesn't work 
in cases when any of the personality flags stored in the top three bytes 
are used.

Directly forcefully setting personality to PER_LINUX32 or PER_LINUX 
discards any flags stored in the top three bytes

Use personality() macro to compare only PER_MASK bytes and make sure that 
we are setting only the bits that should be set, instead of overwriting 
the whole value.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

Resned of patch sent on Thu, 2 Aug 2012 09:10:03 +0200 (CEST)

 arch/powerpc/kernel/syscalls.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index f2496f2..dc1558e 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -107,11 +107,11 @@  long ppc64_personality(unsigned long personality)
 	long ret;
 
 	if (personality(current->personality) == PER_LINUX32
-	    && personality == PER_LINUX)
-		personality = PER_LINUX32;
+	    && personality(personality) == PER_LINUX)
+		personality = (personality & ~PER_MASK) | PER_LINUX32;
 	ret = sys_personality(personality);
-	if (ret == PER_LINUX32)
-		ret = PER_LINUX;
+	if (personality(ret) == PER_LINUX32)
+		ret = (ret & ~PER_MASK) | PER_LINUX;
 	return ret;
 }
 #endif