iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86/fpu/signal: Change return type of fpu__restore_sig() to boolean

Browse Source 
None of the call sites cares about the error code. All they need to know is
whether the function succeeded or not.

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.909065931@linutronix.de
This commit is contained in:
Thomas Gleixner 2021-09-08 15:29:37 +02:00 committed by Borislav Petkov
parent ee4ecdfbd2
commit f3305be5fe
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/ia32/ia32_signal.c
View File

@ -94,7 +94,7 @@ static bool ia32_restore_sigcontext(struct pt_regs *regs,
* normal case.
*/
reload_segments(&sc);
return !fpu__restore_sig(compat_ptr(sc.fpstate), 1);
return fpu__restore_sig(compat_ptr(sc.fpstate), 1);
}
COMPAT_SYSCALL_DEFINE0(sigreturn)

2
arch/x86/include/asm/fpu/internal.h
View File

@ -26,7 +26,7 @@
/*
* High level FPU state handling functions:
*/
extern int fpu__restore_sig(void __user *buf, int ia32_frame);
extern bool fpu__restore_sig(void __user *buf, int ia32_frame);
extern void fpu__drop(struct fpu *fpu);
extern void fpu__clear_user_states(struct fpu *fpu);
extern int fpu__exception_code(struct fpu *fpu, int trap_nr);

22
arch/x86/kernel/fpu/signal.c
View File

@ -433,17 +433,17 @@ static inline int xstate_sigframe_size(void)
/*
* Restore FPU state from a sigframe:
*/
int fpu__restore_sig(void __user *buf, int ia32_frame)
bool fpu__restore_sig(void __user *buf, int ia32_frame)
{
unsigned int size = xstate_sigframe_size();
struct fpu *fpu = &current->thread.fpu;
void __user *buf_fx = buf;
bool ia32_fxstate = false;
int ret;
bool success = false;
if (unlikely(!buf)) {
fpu__clear_user_states(fpu);
return 0;
return true;
}
ia32_frame &= (IS_ENABLED(CONFIG_X86_32) ||
@ -459,23 +459,21 @@ int fpu__restore_sig(void __user *buf, int ia32_frame)
ia32_fxstate = true;
}
if (!access_ok(buf, size)) {
ret = -EACCES;
if (!access_ok(buf, size))
goto out;
}
if (!IS_ENABLED(CONFIG_X86_64) && !cpu_feature_enabled(X86_FEATURE_FPU)) {
ret = fpregs_soft_set(current, NULL, 0,
sizeof(struct user_i387_ia32_struct),
NULL, buf);
success = !fpregs_soft_set(current, NULL, 0,
sizeof(struct user_i387_ia32_struct),
NULL, buf);
} else {
ret = __fpu_restore_sig(buf, buf_fx, ia32_fxstate);
success = !__fpu_restore_sig(buf, buf_fx, ia32_fxstate);
}
out:
if (unlikely(ret))
if (unlikely(!success))
fpu__clear_user_states(fpu);
return ret;
return success;
}
unsigned long

4
arch/x86/kernel/signal.c
View File

@ -136,8 +136,8 @@ static bool restore_sigcontext(struct pt_regs *regs,
force_valid_ss(regs);
#endif
return !fpu__restore_sig((void __user *)sc.fpstate,
IS_ENABLED(CONFIG_X86_32));
return fpu__restore_sig((void __user *)sc.fpstate,
IS_ENABLED(CONFIG_X86_32));
}
static __always_inline int