Commit 98265c17 authored by Yu-cheng Yu's avatar Yu-cheng Yu Committed by Borislav Petkov
Browse files

x86/fpu/xstate: Preserve supervisor states for the slow path in __fpu__restore_sig() 



The signal return code is responsible for taking an XSAVE buffer
present in user memory and loading it into the hardware registers. This
operation only affects user XSAVE state and never affects supervisor
state.

The fast path through this code simply points XRSTOR directly at the
user buffer. However, since user memory is not guaranteed to be always
mapped, this XRSTOR can fail. If it fails, the signal return code falls
back to a slow path which can tolerate page faults.

That slow path copies the xfeatures one by one out of the user buffer
into the task's fpu state area. However, by being in a context where it
can handle page faults, the code can also schedule.

The lazy-fpu-load code would think it has an up-to-date fpstate and
would fail to save the supervisor state when scheduling the task out.
When scheduling back in, it would likely restore stale supervisor state.

To fix that, preserve supervisor state before the slow path.  Modify
copy_user_to_fpregs_zeroing() so that if it fails, fpregs are not zeroed,
and there is no need for fpregs_deactivate() and supervisor states are
preserved.

Move set_thread_flag(TIF_NEED_FPU_LOAD) to the slow path.  Without doing
this, the fast path also needs supervisor states to be saved first.

Signed-off-by: default avatarYu-cheng Yu <yu-cheng.yu@intel.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20200512145444.15483-10-yu-cheng.yu@intel.com
parent eeedf153

arch/x86/kernel/fpu/signal.c

+28 −25
Original line number Diff line number Diff line
@@ -262,19 +262,23 @@ sanitize_restored_user_xstate(union fpregs_state *state, 
static int copy_user_to_fpregs_zeroing(void __user *buf, u64 xbv, int fx_only)

{

	u64 init_bv;

	int r;



	if (use_xsave()) {

		if (fx_only) {

			init_bv = xfeatures_mask_user() & ~XFEATURE_MASK_FPSSE;



			r = copy_user_to_fxregs(buf);

			if (!r)

				copy_kernel_to_xregs(&init_fpstate.xsave, init_bv);

			return copy_user_to_fxregs(buf);

			return r;

		} else {

			init_bv = xfeatures_mask_user() & ~xbv;



			if (unlikely(init_bv))

			r = copy_user_to_xregs(buf, xbv);

			if (!r && unlikely(init_bv))

				copy_kernel_to_xregs(&init_fpstate.xsave, init_bv);

			return copy_user_to_xregs(buf, xbv);

			return r;

		}

	} else if (use_fxsr()) {

		return copy_user_to_fxregs(buf);
@@ -327,28 +331,10 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size) 
		}

	}



	/*

	 * The current state of the FPU registers does not matter. By setting

	 * TIF_NEED_FPU_LOAD unconditionally it is ensured that the our xstate

	 * is not modified on context switch and that the xstate is considered

	 * to be loaded again on return to userland (overriding last_cpu avoids

	 * the optimisation).

	 */

	set_thread_flag(TIF_NEED_FPU_LOAD);

	__fpu_invalidate_fpregs_state(fpu);



	if ((unsigned long)buf_fx % 64)

		fx_only = 1;

	/*

	 * For 32-bit frames with fxstate, copy the fxstate so it can be

	 * reconstructed later.

	 */

	if (ia32_fxstate) {

		ret = __copy_from_user(&env, buf, sizeof(env));

		if (ret)

			goto err_out;

		envp = &env;

	} else {



	if (!ia32_fxstate) {

		/*

		 * Attempt to restore the FPU registers directly from user

		 * memory. For that to succeed, the user access cannot cause
@@ -365,10 +351,27 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size) 
			fpregs_unlock();

			return 0;

		}

		fpregs_deactivate(fpu);

		fpregs_unlock();

	} else {

		/*

		 * For 32-bit frames with fxstate, copy the fxstate so it can

		 * be reconstructed later.

		 */

		ret = __copy_from_user(&env, buf, sizeof(env));

		if (ret)

			goto err_out;

		envp = &env;

	}



	/*

	 * The current state of the FPU registers does not matter. By setting

	 * TIF_NEED_FPU_LOAD unconditionally it is ensured that the our xstate

	 * is not modified on context switch and that the xstate is considered

	 * to be loaded again on return to userland (overriding last_cpu avoids

	 * the optimisation).

	 */

	set_thread_flag(TIF_NEED_FPU_LOAD);

	__fpu_invalidate_fpregs_state(fpu);



	if (use_xsave() && !fx_only) {

		u64 init_bv = xfeatures_mask_user() & ~user_xfeatures;

CRA Git | Maintained and supported by SUSTech CRA and CCSE