Commit 6a877d24 authored by Kyle Huey's avatar Kyle Huey Committed by Dave Hansen
Browse files

x86/fpu: Take task_struct* in copy_sigframe_from_user_to_xstate() 



This will allow copy_sigframe_from_user_to_xstate() to grab the address of
thread_struct's pkru value in a later patch.

Signed-off-by: default avatarKyle Huey <me@kylehuey.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/20221115230932.7126-2-khuey%40kylehuey.com
parent 48280042

arch/x86/kernel/fpu/signal.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static bool __fpu_restore_sig(void __user *buf, void __user *buf_fx, 


	fpregs = &fpu->fpstate->regs;

	if (use_xsave() && !fx_only) {

		if (copy_sigframe_from_user_to_xstate(fpu->fpstate, buf_fx))

		if (copy_sigframe_from_user_to_xstate(tsk, buf_fx))

			return false;

	} else {

		if (__copy_from_user(&fpregs->fxsave, buf_fx,

arch/x86/kernel/fpu/xstate.c

+2 −2
Original line number Diff line number Diff line
@@ -1278,10 +1278,10 @@ int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const void *kbuf) 
 * XSAVE[S] format and copy to the target thread. This is called from the

 * sigreturn() and rt_sigreturn() system calls.

 */

int copy_sigframe_from_user_to_xstate(struct fpstate *fpstate,

int copy_sigframe_from_user_to_xstate(struct task_struct *tsk,

				      const void __user *ubuf)

{

	return copy_uabi_to_xstate(fpstate, NULL, ubuf);

	return copy_uabi_to_xstate(tsk->thread.fpu.fpstate, NULL, ubuf);

}



static bool validate_independent_components(u64 mask)

arch/x86/kernel/fpu/xstate.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ extern void __copy_xstate_to_uabi_buf(struct membuf to, struct fpstate *fpstate, 
extern void copy_xstate_to_uabi_buf(struct membuf to, struct task_struct *tsk,

				    enum xstate_copy_mode mode);

extern int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const void *kbuf);

extern int copy_sigframe_from_user_to_xstate(struct fpstate *fpstate, const void __user *ubuf);

extern int copy_sigframe_from_user_to_xstate(struct task_struct *tsk, const void __user *ubuf);





extern void fpu__init_cpu_xstate(void);