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

!14976 x86/fpu: Ensure shadow stack is active before "getting" registers 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiongfeng Wang <wangxiongfeng2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/5SYQ4XQ5JD7DDB35ALYJTGW2DQTHDE4P/ 
 
https://gitee.com/src-openeuler/kernel/issues/IBIQSM 
 
Link:https://gitee.com/openeuler/kernel/pulls/14976

 

Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 5f597f38 611ed12f

arch/x86/kernel/fpu/regset.c

+2 −1
Original line number Diff line number Diff line
@@ -190,7 +190,8 @@ int ssp_get(struct task_struct *target, const struct user_regset *regset, 
	struct fpu *fpu = &target->thread.fpu;

	struct cet_user_state *cetregs;



	if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK))

	if (!cpu_feature_enabled(X86_FEATURE_USER_SHSTK) ||

	    !ssp_active(target, regset))

		return -ENODEV;



	sync_fpstate(fpu);