x86/fpu: Pass 'struct fpu' to fpstate_sanitize_xstate()
Currently fpstate_sanitize_xstate() has a task_struct input parameter, but it only uses the fpu structure from it - so pass in a 'struct fpu' pointer only and update all call sites. Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Fenghua Yu <fenghua.yu@intel.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Родитель
1ac91a767f
Коммит
36e49e7f2e
|
@ -139,7 +139,7 @@ static inline void fx_finit(struct i387_fxsave_struct *fx)
|
|||
fx->mxcsr = MXCSR_DEFAULT;
|
||||
}
|
||||
|
||||
extern void fpstate_sanitize_xstate(struct task_struct *);
|
||||
extern void fpstate_sanitize_xstate(struct fpu *fpu);
|
||||
|
||||
#define user_insn(insn, output, input...) \
|
||||
({ \
|
||||
|
|
|
@ -395,7 +395,7 @@ int xfpregs_get(struct task_struct *target, const struct user_regset *regset,
|
|||
return -ENODEV;
|
||||
|
||||
fpu__activate_stopped(fpu);
|
||||
fpstate_sanitize_xstate(target);
|
||||
fpstate_sanitize_xstate(fpu);
|
||||
|
||||
return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
|
||||
&fpu->state.fxsave, 0, -1);
|
||||
|
@ -412,7 +412,7 @@ int xfpregs_set(struct task_struct *target, const struct user_regset *regset,
|
|||
return -ENODEV;
|
||||
|
||||
fpu__activate_stopped(fpu);
|
||||
fpstate_sanitize_xstate(target);
|
||||
fpstate_sanitize_xstate(fpu);
|
||||
|
||||
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
|
||||
&fpu->state.fxsave, 0, -1);
|
||||
|
@ -644,7 +644,7 @@ int fpregs_get(struct task_struct *target, const struct user_regset *regset,
|
|||
&fpu->state.fsave, 0,
|
||||
-1);
|
||||
|
||||
fpstate_sanitize_xstate(target);
|
||||
fpstate_sanitize_xstate(fpu);
|
||||
|
||||
if (kbuf && pos == 0 && count == sizeof(env)) {
|
||||
convert_from_fxsr(kbuf, target);
|
||||
|
@ -665,8 +665,7 @@ int fpregs_set(struct task_struct *target, const struct user_regset *regset,
|
|||
int ret;
|
||||
|
||||
fpu__activate_stopped(fpu);
|
||||
|
||||
fpstate_sanitize_xstate(target);
|
||||
fpstate_sanitize_xstate(fpu);
|
||||
|
||||
if (!static_cpu_has(X86_FEATURE_FPU))
|
||||
return fpregs_soft_set(target, regset, pos, count, kbuf, ubuf);
|
||||
|
|
|
@ -92,16 +92,16 @@ EXPORT_SYMBOL_GPL(cpu_has_xfeatures);
|
|||
* if the corresponding header bit is zero. This is to ensure that user-space doesn't
|
||||
* see some stale state in the memory layout during signal handling, debugging etc.
|
||||
*/
|
||||
void fpstate_sanitize_xstate(struct task_struct *tsk)
|
||||
void fpstate_sanitize_xstate(struct fpu *fpu)
|
||||
{
|
||||
struct i387_fxsave_struct *fx = &tsk->thread.fpu.state.fxsave;
|
||||
struct i387_fxsave_struct *fx = &fpu->state.fxsave;
|
||||
int feature_bit;
|
||||
u64 xfeatures;
|
||||
|
||||
if (!use_xsaveopt())
|
||||
return;
|
||||
|
||||
xfeatures = tsk->thread.fpu.state.xsave.header.xfeatures;
|
||||
xfeatures = fpu->state.xsave.header.xfeatures;
|
||||
|
||||
/*
|
||||
* None of the feature bits are in init state. So nothing else
|
||||
|
@ -318,7 +318,7 @@ int save_xstate_sig(void __user *buf, void __user *buf_fx, int size)
|
|||
if (ia32_fxstate)
|
||||
fpu_fxsave(&tsk->thread.fpu);
|
||||
} else {
|
||||
fpstate_sanitize_xstate(tsk);
|
||||
fpstate_sanitize_xstate(&tsk->thread.fpu);
|
||||
if (__copy_to_user(buf_fx, xsave, xstate_size))
|
||||
return -1;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче