From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: x86@kernel.org, Al Viro <viro@zeniv.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
Tony Luck <tony.luck@intel.com>, Song Liu <songliubraving@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Peter Ziljstra <peterz@infradead.org>
Subject: [patch V2.1 14/20] x86/fpu/signal: Change return type of copy_fpstate_to_sigframe() to boolean
Date: Tue, 7 Sep 2021 22:25:02 +0200 (CEST) [thread overview]
Message-ID: <20210907200849.049727746@linutronix.de> (raw)
In-Reply-To: 20210907200722.067068005@linutronix.de
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>
---
arch/x86/ia32/ia32_signal.c | 4 ++--
arch/x86/include/asm/fpu/internal.h | 2 +-
arch/x86/kernel/fpu/signal.c | 20 ++++++++++----------
arch/x86/kernel/signal.c | 4 +---
4 files changed, 14 insertions(+), 16 deletions(-)
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -220,8 +220,8 @@ static void __user *get_sigframe(struct
sp = fpu__alloc_mathframe(sp, 1, &fx_aligned, &math_size);
*fpstate = (struct _fpstate_32 __user *) sp;
- if (copy_fpstate_to_sigframe(*fpstate, (void __user *)fx_aligned,
- math_size) < 0)
+ if (!copy_fpstate_to_sigframe(*fpstate, (void __user *)fx_aligned,
+ math_size))
return (void __user *) -1L;
sp -= frame_size;
--- a/arch/x86/include/asm/fpu/internal.h
+++ b/arch/x86/include/asm/fpu/internal.h
@@ -418,7 +418,7 @@ static inline void restore_fpregs_from_f
__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:
--- a/arch/x86/kernel/fpu/signal.c
+++ b/arch/x86/kernel/fpu/signal.c
@@ -165,7 +165,7 @@ static inline int copy_fpregs_to_sigfram
* 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.
*/
-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;
int ia32_fxstate = (buf != buf_fx);
@@ -176,13 +176,14 @@ int copy_fpstate_to_sigframe(void __user
if (!static_cpu_has(X86_FEATURE_FPU)) {
struct user_i387_ia32_struct fp;
+
fpregs_soft_get(current, NULL, (struct membuf){.p = &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))
- return -EACCES;
+ return false;
if (use_xsave()) {
struct xregs_state __user *xbuf = buf_fx;
@@ -191,9 +192,8 @@ int copy_fpstate_to_sigframe(void __user
* Clear the xsave header first, so that reserved fields are
* initialized to zero.
*/
- ret = __clear_user(&xbuf->header, sizeof(xbuf->header));
- if (unlikely(ret))
- return ret;
+ if (__clear_user(&xbuf->header, sizeof(xbuf->header)))
+ return false;
}
retry:
/*
@@ -215,17 +215,17 @@ int copy_fpstate_to_sigframe(void __user
if (!__clear_user(buf_fx, fpu_user_xstate_size) &&
ret == X86_TRAP_PF)
goto retry;
- return -1;
+ return false;
}
/* Save the fsave header for the 32-bit frames. */
if ((ia32_fxstate || !use_fxsr()) && save_fsave_header(tsk, buf))
- return -1;
+ return false;
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,
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -244,7 +244,6 @@ get_sigframe(struct k_sigaction *ka, str
unsigned long math_size = 0;
unsigned long sp = regs->sp;
unsigned long buf_fx = 0;
- int ret;
/* redzone */
if (IS_ENABLED(CONFIG_X86_64))
@@ -292,8 +291,7 @@ get_sigframe(struct k_sigaction *ka, str
}
/* save i387 and extended state */
- ret = copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size);
- if (ret < 0)
+ if (!copy_fpstate_to_sigframe(*fpstate, (void __user *)buf_fx, math_size))
return (void __user *)-1L;
return (void __user *)sp;
next prev parent reply other threads:[~2021-09-07 20:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-07 20:24 [patch V2.1 00/20] x86/fpu: Clean up exception fixups and error handling in sigframe related code Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 01/20] x86/extable: Tidy up redundant handler functions Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 02/20] x86/extable: Get rid of redundant macros Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 03/20] x86/mce: Deduplicate exception handling Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 04/20] x86/mce: Get rid of stray semicolons Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 05/20] x86/extable: Rework the exception table mechanics Thomas Gleixner
2021-09-07 20:37 ` Linus Torvalds
2021-09-07 21:44 ` Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 06/20] x86/extable: Provide EX_TYPE_DEFAULT_MCE_SAFE and EX_TYPE_FAULT_MCE_SAFE Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 07/20] x86/copy_mc: Use EX_TYPE_DEFAULT_MCE_SAFE for exception fixups Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 08/20] x86/fpu: Use EX_TYPE_FAULT_MCE_SAFE " Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 09/20] x86/extable: Remove EX_TYPE_FAULT from MCE safe fixups Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 10/20] x86/fpu/signal: Clarify exception handling in restore_fpregs_from_user() Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 11/20] x86/fpu: Dont use MCE safe fixups for writing FPU state to user space Thomas Gleixner
2021-09-07 20:24 ` [patch V2.1 12/20] x86/fpu/signal: Move header zeroing out of xsave_to_user_sigframe() Thomas Gleixner
2021-09-07 20:25 ` [patch V2.1 13/20] x86/fpu/signal: Move xstate clearing out of copy_fpregs_to_sigframe() Thomas Gleixner
2021-09-07 20:25 ` Thomas Gleixner [this message]
2021-09-07 20:25 ` [patch V2.1 15/20] x86/fpu/signal: Change return type of copy_fpregs_to_sigframe() helpers to boolean Thomas Gleixner
2021-09-07 20:25 ` [patch V2.1 16/20] x86/signal: Change return type of restore_sigcontext() " Thomas Gleixner
2021-09-07 20:25 ` [patch V2.1 17/20] x86/fpu/signal: Change return type of fpu__restore_sig() " Thomas Gleixner
2021-09-07 20:25 ` [patch V2.1 18/20] x86/fpu/signal: Change return type of __fpu_restore_sig() " Thomas Gleixner
2021-09-07 20:25 ` [patch V2.1 19/20] x86/fpu/signal: Change return code of check_xstate_in_sigframe() " Thomas Gleixner
2021-09-07 20:25 ` [patch V2.1 20/20] x86/fpu/signal: Change return code of restore_fpregs_from_user() " Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210907200849.049727746@linutronix.de \
--to=tglx@linutronix.de \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=songliubraving@fb.com \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
--cc=viro@zeniv.linux.org.uk \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox