s390 patches for 4.5-rc6

GIT PULL Martin Schwidefsky 1 participant 1 message Feb 25, 2016 s390

lore

Share & tools

lore

Martin Schwidefsky

author

2016-02-25 08:30 UTC #0 lore raw

Hi Linus,

please pull from the 'for-linus' branch of

git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus

to receive the following updates:

Two critical bug fixes for the signal handling.

Martin Schwidefsky (2):
s390/compat: correct restore of high gprs on signal return s390/fpu: signals vs. floating point control register

 arch/s390/include/asm/fpu/internal.h | 2 ++
 arch/s390/kernel/compat_signal.c     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

arch/s390/include/asm/fpu/internal.h +2 -0

index ea91ddf..629c908 100644
@@ -40,6 +40,7 @@ static inline void convert_fp_to_vx(__vector128 *vxrs, freg_t *fprs)
 static inline void fpregs_store(_s390_fp_regs *fpregs, struct fpu *fpu)
 {
 	fpregs->pad = 0;
+	fpregs->fpc = fpu->fpc;
 	if (MACHINE_HAS_VX)
 		convert_vx_to_fp((freg_t *)&fpregs->fprs, fpu->vxrs);
 	else

@@ -49,6 +50,7 @@ static inline void fpregs_store(_s390_fp_regs *fpregs, struct fpu *fpu)
 
 static inline void fpregs_load(_s390_fp_regs *fpregs, struct fpu *fpu)
 {
+	fpu->fpc = fpregs->fpc;
 	if (MACHINE_HAS_VX)
 		convert_fp_to_vx(fpu->vxrs, (freg_t *)&fpregs->fprs);
 	else

arch/s390/kernel/compat_signal.c +1 -1

index 66c9441..4af6037 100644
@@ -271,7 +271,7 @@ static int restore_sigregs_ext32(struct pt_regs *regs,
 
 	/* Restore high gprs from signal stack */
 	if (__copy_from_user(&gprs_high, &sregs_ext->gprs_high,
-			     sizeof(&sregs_ext->gprs_high)))
+			     sizeof(sregs_ext->gprs_high)))
 		return -EFAULT;
 	for (i = 0; i < NUM_GPRS; i++)
 		*(__u32 *)&regs->gprs[i] = gprs_high[i];