Skip to content

Commit 6a877d2

Browse files
khueyhansendc
authored andcommitted
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: Kyle Huey <me@kylehuey.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Link: https://lore.kernel.org/all/20221115230932.7126-2-khuey%40kylehuey.com
1 parent 4828004 commit 6a877d2

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

arch/x86/kernel/fpu/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ static bool __fpu_restore_sig(void __user *buf, void __user *buf_fx,
396396

397397
fpregs = &fpu->fpstate->regs;
398398
if (use_xsave() && !fx_only) {
399-
if (copy_sigframe_from_user_to_xstate(fpu->fpstate, buf_fx))
399+
if (copy_sigframe_from_user_to_xstate(tsk, buf_fx))
400400
return false;
401401
} else {
402402
if (__copy_from_user(&fpregs->fxsave, buf_fx,

arch/x86/kernel/fpu/xstate.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1278,10 +1278,10 @@ int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const void *kbuf)
12781278
* XSAVE[S] format and copy to the target thread. This is called from the
12791279
* sigreturn() and rt_sigreturn() system calls.
12801280
*/
1281-
int copy_sigframe_from_user_to_xstate(struct fpstate *fpstate,
1281+
int copy_sigframe_from_user_to_xstate(struct task_struct *tsk,
12821282
const void __user *ubuf)
12831283
{
1284-
return copy_uabi_to_xstate(fpstate, NULL, ubuf);
1284+
return copy_uabi_to_xstate(tsk->thread.fpu.fpstate, NULL, ubuf);
12851285
}
12861286

12871287
static bool validate_independent_components(u64 mask)

arch/x86/kernel/fpu/xstate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extern void __copy_xstate_to_uabi_buf(struct membuf to, struct fpstate *fpstate,
4747
extern void copy_xstate_to_uabi_buf(struct membuf to, struct task_struct *tsk,
4848
enum xstate_copy_mode mode);
4949
extern int copy_uabi_from_kernel_to_xstate(struct fpstate *fpstate, const void *kbuf);
50-
extern int copy_sigframe_from_user_to_xstate(struct fpstate *fpstate, const void __user *ubuf);
50+
extern int copy_sigframe_from_user_to_xstate(struct task_struct *tsk, const void __user *ubuf);
5151

5252

5353
extern void fpu__init_cpu_xstate(void);

0 commit comments

Comments
 (0)