Skip to content

Commit

Permalink
x86/fpu/signal: Change return type of copy_fpregs_to_sigframe() helpe…
Browse files Browse the repository at this point in the history
…rs to boolean

Now that copy_fpregs_to_sigframe() returns boolean the individual return
codes in the related helper functions do not make sense anymore. Change
them to return boolean success/fail.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20210908132525.794334915@linutronix.de
  • Loading branch information
KAGA-KOKO authored and suryasaimadhu committed Sep 14, 2021
1 parent 052adee commit 2af07f3
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions arch/x86/kernel/fpu/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static inline int check_xstate_in_sigframe(struct fxregs_state __user *fxbuf,
/*
* Signal frame handlers.
*/
static inline int save_fsave_header(struct task_struct *tsk, void __user *buf)
static inline bool save_fsave_header(struct task_struct *tsk, void __user *buf)
{
if (use_fxsr()) {
struct xregs_state *xsave = &tsk->thread.fpu.state.xsave;
Expand All @@ -82,18 +82,19 @@ static inline int save_fsave_header(struct task_struct *tsk, void __user *buf)
if (__copy_to_user(buf, &env, sizeof(env)) ||
__put_user(xsave->i387.swd, &fp->status) ||
__put_user(X86_FXSR_MAGIC, &fp->magic))
return -1;
return false;
} else {
struct fregs_state __user *fp = buf;
u32 swd;

if (__get_user(swd, &fp->swd) || __put_user(swd, &fp->status))
return -1;
return false;
}

return 0;
return true;
}

static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
static inline bool save_xstate_epilog(void __user *buf, int ia32_frame)
{
struct xregs_state __user *x = buf;
struct _fpx_sw_bytes *sw_bytes;
Expand Down Expand Up @@ -131,7 +132,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)

err |= __put_user(xfeatures, (__u32 __user *)&x->header.xfeatures);

return err;
return !err;
}

static inline int copy_fpregs_to_sigframe(struct xregs_state __user *buf)
Expand Down Expand Up @@ -218,10 +219,10 @@ bool copy_fpstate_to_sigframe(void __user *buf, void __user *buf_fx, int size)
}

/* 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 false;

if (use_fxsr() && save_xstate_epilog(buf_fx, ia32_fxstate))
if (use_fxsr() && !save_xstate_epilog(buf_fx, ia32_fxstate))
return false;

return true;
Expand Down

0 comments on commit 2af07f3

Please sign in to comment.