x86/fpu/signal: Change return type of copy_fpstate_to_sigframe() to boolean
None of the call sites cares about the actual return code. Change the return type to boolean and return 'true' on success. Suggested-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20210908132525.736773588@linutronix.de
This commit is contained in:
committed by
Borislav Petkov
parent
fcfb716332
commit
052adee668
@@ -220,8 +220,8 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
|
|||||||
|
|
||||||
sp = fpu__alloc_mathframe(sp, 1, &fx_aligned, &math_size);
|
sp = fpu__alloc_mathframe(sp, 1, &fx_aligned, &math_size);
|
||||||
*fpstate = (struct _fpstate_32 __user *) sp;
|
*fpstate = (struct _fpstate_32 __user *) sp;
|
||||||
if (copy_fpstate_to_sigframe(*fpstate, (void __user *)fx_aligned,
|
if (!copy_fpstate_to_sigframe(*fpstate, (void __user *)fx_aligned,
|
||||||
math_size) < 0)
|
math_size))
|
||||||
return (void __user *) -1L;
|
return (void __user *) -1L;
|
||||||
|
|
||||||
sp -= frame_size;
|
sp -= frame_size;
|
||||||
|
|||||||
@@ -386,7 +386,7 @@ static inline void restore_fpregs_from_fpstate(union fpregs_state *fpstate)
|
|||||||
__restore_fpregs_from_fpstate(fpstate, xfeatures_mask_fpstate());
|
__restore_fpregs_from_fpstate(fpstate, xfeatures_mask_fpstate());
|
||||||
}
|
}
|
||||||
|
|
||||||
extern int copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);
|
extern bool copy_fpstate_to_sigframe(void __user *buf, void __user *fp, int size);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* FPU context switch related helper methods:
|
* FPU context switch related helper methods:
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)
|
|||||||
* For [f]xsave state, update the SW reserved fields in the [f]xsave frame
|
* For [f]xsave state, update the SW reserved fields in the [f]xsave frame
|
||||||
* indicating the absence/presence of the extended state to the user.
|
* indicating the absence/presence of the extended state to the user.
|
||||||
*/
|
*/
|
||||||
int copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
|
bool copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
|
||||||
{
|
{
|
||||||
struct task_struct *tsk = current;
|
struct task_struct *tsk = current;
|
||||||
int ia32_fxstate = (buf != buf_fx);
|
int ia32_fxstate = (buf != buf_fx);
|
||||||
@@ -176,13 +176,14 @@ int copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
|
|||||||
|
|
||||||
if (!static_cpu_has(X86_FEATURE_FPU)) {
|
if (!static_cpu_has(X86_FEATURE_FPU)) {
|
||||||
struct user_i387_ia32_struct fp;
|
struct user_i387_ia32_struct fp;
|
||||||
|
|
||||||
fpregs_soft_get(current, NULL, (struct membuf){.p = &fp,
|
fpregs_soft_get(current, NULL, (struct membuf){.p = &fp,
|
||||||
.left = sizeof(fp)});
|
.left = sizeof(fp)});
|
||||||
return copy_to_user(buf, &fp, sizeof(fp)) ? -EFAULT : 0;
|
return !copy_to_user(buf, &fp, sizeof(fp));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!access_ok(buf, size))
|
if (!access_ok(buf, size))
|
||||||
return -EACCES;
|
return false;
|
||||||
|
|
||||||
if (use_xsave()) {
|
if (use_xsave()) {
|
||||||
struct xregs_state __user *xbuf = buf_fx;
|
struct xregs_state __user *xbuf = buf_fx;
|
||||||
@@ -191,9 +192,8 @@ int copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
|
|||||||
* Clear the xsave header first, so that reserved fields are
|
* Clear the xsave header first, so that reserved fields are
|
||||||
* initialized to zero.
|
* initialized to zero.
|
||||||
*/
|
*/
|
||||||
ret = __clear_user(&xbuf->header, sizeof(xbuf->header));
|
if (__clear_user(&xbuf->header, sizeof(xbuf->header)))
|
||||||
if (unlikely(ret))
|
return false;
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
retry:
|
retry:
|
||||||
/*
|
/*
|
||||||
@@ -214,17 +214,17 @@ retry:
|
|||||||
if (ret) {
|
if (ret) {
|
||||||
if (!__clear_user(buf_fx, fpu_user_xstate_size))
|
if (!__clear_user(buf_fx, fpu_user_xstate_size))
|
||||||
goto retry;
|
goto retry;
|
||||||
return -1;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Save the fsave header for the 32-bit frames. */
|
/* Save the fsave header for the 32-bit frames. */
|
||||||
if ((ia32_fxstate || !use_fxsr()) && save_fsave_header(tsk, buf))
|
if ((ia32_fxstate || !use_fxsr()) && save_fsave_header(tsk, buf))
|
||||||
return -1;
|
return false;
|
||||||
|
|
||||||
if (use_fxsr() && save_xstate_epilog(buf_fx, ia32_fxstate))
|
if (use_fxsr() && save_xstate_epilog(buf_fx, ia32_fxstate))
|
||||||
return -1;
|
return false;
|
||||||
|
|
||||||
return 0;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int __restore_fpregs_from_user(void __user *buf, u64 xrestore,
|
static int __restore_fpregs_from_user(void __user *buf, u64 xrestore,
|
||||||
|
|||||||
@@ -244,7 +244,6 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
|
|||||||
unsigned long math_size = 0;
|
unsigned long math_size = 0;
|
||||||
unsigned long sp = regs->sp;
|
unsigned long sp = regs->sp;
|
||||||
unsigned long buf_fx = 0;
|
unsigned long buf_fx = 0;
|
||||||
int ret;
|
|
||||||
|
|
||||||
/* redzone */
|
/* redzone */
|
||||||
if (IS_ENABLED(CONFIG_X86_64))
|
if (IS_ENABLED(CONFIG_X86_64))
|
||||||
@@ -292,8 +291,7 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* save i387 and extended state */
|
/* save i387 and extended state */
|
||||||
ret = copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size);
|
if (!copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size))
|
||||||
if (ret < 0)
|
|
||||||
return (void __user *)-1L;
|
return (void __user *)-1L;
|
||||||
|
|
||||||
return (void __user *)sp;
|
return (void __user *)sp;
|
||||||
|
|||||||
Reference in New Issue
Block a user