Unverified Commit b22dccdd authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!5843 [sync] PR-5348: s390/ptrace: handle setting of fpc register correctly 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5348 
 
PR sync from: Zheng Zucheng <zhengzucheng@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/2VK7OF5YR2E3GU2M6KDDTJEOSSGR3XAY/ 
 
https://gitee.com/src-openeuler/kernel/issues/I96G7Q 
 
Link:https://gitee.com/openeuler/kernel/pulls/5843

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 83574548 74069cec

arch/s390/kernel/ptrace.c

+3 −3
Original line number Diff line number Diff line
@@ -411,6 +411,7 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data) 
		/*

		 * floating point control reg. is in the thread structure

		 */

		save_fpu_regs();

		if ((unsigned int) data != 0 ||

		    test_fp_ctl(data >> (BITS_PER_LONG - 32)))

			return -EINVAL;
@@ -773,6 +774,7 @@ static int __poke_user_compat(struct task_struct *child, 
		/*

		 * floating point control reg. is in the thread structure

		 */

		save_fpu_regs();

		if (test_fp_ctl(tmp))

			return -EINVAL;

		child->thread.fpu.fpc = data;
@@ -1014,9 +1016,7 @@ static int s390_fpregs_set(struct task_struct *target, 
	int rc = 0;

	freg_t fprs[__NUM_FPRS];



	if (target == current)

	save_fpu_regs();



	if (MACHINE_HAS_VX)

		convert_vx_to_fp(fprs, target->thread.fpu.vxrs);

	else