summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/sys_s390.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-08-02 09:11:23 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-08-08 07:32:56 -0700
commit5ab37e1b226b7b40a44eea7d8d1fe19e67ff65a9 (patch)
tree0f267a0f5bdbc07797895369f5e04024ba2fb987 /arch/s390/kernel/sys_s390.c
parentc63cb468f373f479ff52b4a1b75f8ecdeaaf4f16 (diff)
downloadlinux-5ab37e1b226b7b40a44eea7d8d1fe19e67ff65a9.tar.gz
linux-5ab37e1b226b7b40a44eea7d8d1fe19e67ff65a9.tar.bz2
linux-5ab37e1b226b7b40a44eea7d8d1fe19e67ff65a9.zip
s390: do not clobber personality flags in sys_32_personality()
There are multiple errors in how sys_32_personality() handles personality flags stored in top three bytes. - 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 Fix the first one by properly using personality() macro to compare only PER_MASK bytes. Fix the second one by setting only the bits that should be set, instead of overwriting the whole value. Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/sys_s390.c')
-rw-r--r--arch/s390/kernel/sys_s390.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/s390/kernel/sys_s390.c b/arch/s390/kernel/sys_s390.c
index b4a29eee41b8..d0964d22adb5 100644
--- a/arch/s390/kernel/sys_s390.c
+++ b/arch/s390/kernel/sys_s390.c
@@ -81,11 +81,12 @@ SYSCALL_DEFINE1(s390_personality, unsigned int, personality)
{
unsigned int ret;
- if (current->personality == PER_LINUX32 && personality == PER_LINUX)
- personality = PER_LINUX32;
+ if (personality(current->personality) == PER_LINUX32 &&
+ personality(personality) == PER_LINUX)
+ personality |= PER_LINUX32;
ret = sys_personality(personality);
- if (ret == PER_LINUX32)
- ret = PER_LINUX;
+ if (personality(ret) == PER_LINUX32)
+ ret &= ~PER_LINUX32;
return ret;
}