x86/fpu: Always store the registers in copy_fpstate_to_sigframe() (69277c98) · Commits · 戴 / test

copy_fpstate_to_sigframe() stores the registers directly to user space. This is okay because the FPU registers are valid and saving them directly avoids saving them into kernel memory and making a copy. However, this cannot be done anymore if the FPU registers are going to be restored on the return to userland. It is possible that the FPU registers will be invalidated in the middle of the save operation and this should be done with disabled preemption / BH. Save the FPU registers to the task's FPU struct and copy them to the user memory later on. Signed-off-by:

Rik van Riel <riel@surriel.com> Signed-off-by:

Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by:

Borislav Petkov <bp@suse.de> Reviewed-by:

Dave Hansen <dave.hansen@intel.com> Reviewed-by:

Thomas Gleixner <tglx@linutronix.de> Cc: Andy Lutomirski <luto@kernel.org> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jann Horn <jannh@google.com> Cc: "Jason A. Donenfeld" <Jason@zx2c4.com> Cc: kvm ML <kvm@vger.kernel.org> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Radim Krčmář <rkrcmar@redhat.com> Cc: x86-ml <x86@kernel.org> Link: https://lkml.kernel.org/r/20190403164156.19645-18-bigeasy@linutronix.de

arch/x86/kernel/fpu/signal.c

+14 −5

Original line number	Diff line number	Diff line
		@@ -144,8 +144,8 @@ static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)
		* buf == buf_fx for 64-bit frames and 32-bit fsave frame.
		* buf != buf_fx for 32-bit frames with fxstate.
		*
		* Save the state directly to the user frame pointed by the aligned pointer
		* 'buf_fx'.
		* Save the state to task's fpu->state and then copy it to the user frame
		* pointed to by the aligned pointer 'buf_fx'.
		*
		* If this is a 32-bit frame with fxstate, put a fsave header before
		* the aligned state at 'buf_fx'.
		@@ -155,6 +155,8 @@ static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)
		*/
		int copy_fpstate_to_sigframe(void __user buf, void __user buf_fx, int size)
		{
		struct fpu *fpu = &current->thread.fpu;
		struct xregs_state *xsave = &fpu->state.xsave;
		struct task_struct *tsk = current;
		int ia32_fxstate = (buf != buf_fx);

		@@ -169,9 +171,16 @@ int copy_fpstate_to_sigframe(void __user buf, void __user buf_fx, int size)
		sizeof(struct user_i387_ia32_struct), NULL,
		(struct _fpstate_32 __user *) buf) ? -1 : 1;

		/* Save the live registers state to the user frame directly. */
		if (copy_fpregs_to_sigframe(buf_fx))
		copy_fpregs_to_fpstate(fpu);

		if (using_compacted_format()) {
		if (copy_xstate_to_user(buf_fx, xsave, 0, size))
		return -1;
		} else {
		fpstate_sanitize_xstate(fpu);
		if (__copy_to_user(buf_fx, xsave, fpu_user_xstate_size))
		return -1;
		}

		/* Save the fsave header for the 32-bit frames. */
		if ((ia32_fxstate \|\| !use_fxsr()) && save_fsave_header(tsk, buf))

Admin message