Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

s390/kernel: use test_fp_ctl() to verify the floating-point control word

Browse Source 
Use the test_fp_ctl() to test the floating-point control word
for validity and use restore_fp_ctl() to set it in load_sigregs.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Hendrik Brueckner 2015-04-28 11:30:40 +02:00 committed by Martin Schwidefsky
parent 2e54dc3c7d
commit 4084eb7767
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/s390/include/asm/switch_to.h
View File

@ -45,7 +45,6 @@ static inline int restore_fp_ctl(u32 *fpc)
" lfpc %1\n" " lfpc %1\n"
"0: la %0,0\n" "0: la %0,0\n"
"1:\n" "1:\n"
EX_TABLE(0b,1b)
: "=d" (rc) : "Q" (*fpc), "0" (-EINVAL)); : "=d" (rc) : "Q" (*fpc), "0" (-EINVAL));
return rc; return rc;
} }

6
arch/s390/kernel/compat_signal.c
View File

@ -172,7 +172,7 @@ static void load_sigregs(void)
int i; int i;
restore_access_regs(current->thread.acrs); restore_access_regs(current->thread.acrs);
/* restore_fp_ctl is done in restore_sigregs */ restore_fp_ctl(&current->thread.fp_regs.fpc);
if (current->thread.vxrs) { if (current->thread.vxrs) {
for (i = 0; i < __NUM_FPRS; i++) for (i = 0; i < __NUM_FPRS; i++)
*(freg_t *)(current->thread.vxrs + i) = *(freg_t *)(current->thread.vxrs + i) =
@ -217,8 +217,8 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs)
if (!is_ri_task(current) && (user_sregs.regs.psw.mask & PSW32_MASK_RI)) if (!is_ri_task(current) && (user_sregs.regs.psw.mask & PSW32_MASK_RI))
return -EINVAL; return -EINVAL;
/* Loading the floating-point-control word can fail. Do that first. */ /* Test the floating-point-control word. */
if (restore_fp_ctl(&user_sregs.fpregs.fpc)) if (test_fp_ctl(user_sregs.fpregs.fpc))
return -EINVAL; return -EINVAL;
/* Use regs->psw.mask instead of PSW_USER_BITS to preserve PER bit. */ /* Use regs->psw.mask instead of PSW_USER_BITS to preserve PER bit. */

6
arch/s390/kernel/signal.c
View File

@ -121,7 +121,7 @@ static void store_sigregs(void)
static void load_sigregs(void) static void load_sigregs(void)
{ {
restore_access_regs(current->thread.acrs); restore_access_regs(current->thread.acrs);
/* restore_fp_ctl is done in restore_sigregs */ restore_fp_ctl(&current->thread.fp_regs.fpc);
if (current->thread.vxrs) { if (current->thread.vxrs) {
int i; int i;
@ -166,8 +166,8 @@ static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs)
if (!is_ri_task(current) && (user_sregs.regs.psw.mask & PSW_MASK_RI)) if (!is_ri_task(current) && (user_sregs.regs.psw.mask & PSW_MASK_RI))
return -EINVAL; return -EINVAL;
/* Loading the floating-point-control word can fail. Do that first. */ /* Test the floating-point-control word. */
if (restore_fp_ctl(&user_sregs.fpregs.fpc)) if (test_fp_ctl(user_sregs.fpregs.fpc))
return -EINVAL; return -EINVAL;
/* Use regs->psw.mask instead of PSW_USER_BITS to preserve PER bit. */ /* Use regs->psw.mask instead of PSW_USER_BITS to preserve PER bit. */