qiurui
/
linux-kernelorg-stable
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

x86/signal: Remove sigset_t parameter from frame setup functions 

Push down the call to sigmask_to_save() into the frame setup functions.
Thus, remove the use of compat_sigset_t outside of the compat code.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Link: https://lore.kernel.org/r/20220606203802.158958-3-brgerst@gmail.com
Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
Brian Gerst 2022-06-06 16:37:56 -04:00 committed by Borislav Petkov
parent 8bb2d28e2b
commit f544822ea5
4 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,9 +230,9 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
return (void __user *) sp; return (void __user *) sp;
} }
int ia32_setup_frame(struct ksignal *ksig, int ia32_setup_frame(struct ksignal *ksig, struct pt_regs *regs)
compat_sigset_t *set, struct pt_regs *regs)
{ {
compat_sigset_t *set = (compat_sigset_t *) sigmask_to_save();
struct sigframe_ia32 __user *frame; struct sigframe_ia32 __user *frame;
void __user *restorer; void __user *restorer;
void __user *fp = NULL; void __user *fp = NULL;
@ -296,9 +296,9 @@ Efault:
return -EFAULT; return -EFAULT;
} }
int ia32_setup_rt_frame(struct ksignal *ksig, int ia32_setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
compat_sigset_t *set, struct pt_regs *regs)
{ {
compat_sigset_t *set = (compat_sigset_t *) sigmask_to_save();
struct rt_sigframe_ia32 __user *frame; struct rt_sigframe_ia32 __user *frame;
void __user *restorer; void __user *restorer;
void __user *fp = NULL; void __user *fp = NULL;

6
arch/x86/include/asm/fpu/signal.h
View File

@ -14,10 +14,8 @@
# include <uapi/asm/sigcontext.h> # include <uapi/asm/sigcontext.h>
# include <asm/user32.h> # include <asm/user32.h>
struct ksignal; struct ksignal;
int ia32_setup_rt_frame(struct ksignal *ksig, int ia32_setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs);
compat_sigset_t *set, struct pt_regs *regs); int ia32_setup_frame(struct ksignal *ksig, struct pt_regs *regs);
int ia32_setup_frame(struct ksignal *ksig,
compat_sigset_t *set, struct pt_regs *regs);
#else #else
# define user_i387_ia32_struct user_i387_struct # define user_i387_ia32_struct user_i387_struct
# define user32_fxsr_struct user_fxsr_struct # define user32_fxsr_struct user_fxsr_struct

5
arch/x86/include/asm/signal.h
View File

@ -28,11 +28,6 @@ typedef struct {
#define SA_IA32_ABI 0x02000000u #define SA_IA32_ABI 0x02000000u
#define SA_X32_ABI 0x01000000u #define SA_X32_ABI 0x01000000u
#ifndef CONFIG_COMPAT
#define compat_sigset_t compat_sigset_t
typedef sigset_t compat_sigset_t;
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#include <uapi/asm/signal.h> #include <uapi/asm/signal.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__

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

@ -324,9 +324,9 @@ static const struct {
}; };
static int static int
__setup_frame(struct ksignal *ksig, sigset_t *set, __setup_frame(struct ksignal *ksig, struct pt_regs *regs)
struct pt_regs *regs)
{ {
sigset_t *set = sigmask_to_save();
struct sigframe __user *frame; struct sigframe __user *frame;
void __user *restorer; void __user *restorer;
void __user *fp = NULL; void __user *fp = NULL;
@ -379,9 +379,9 @@ Efault:
return -EFAULT; return -EFAULT;
} }
static int __setup_rt_frame(struct ksignal *ksig, static int __setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
sigset_t *set, struct pt_regs *regs)
{ {
sigset_t *set = sigmask_to_save();
struct rt_sigframe __user *frame; struct rt_sigframe __user *frame;
void __user *restorer; void __user *restorer;
void __user *fp = NULL; void __user *fp = NULL;
@ -458,9 +458,9 @@ static unsigned long frame_uc_flags(struct pt_regs *regs)
return flags; return flags;
} }
static int __setup_rt_frame(struct ksignal *ksig, static int __setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
sigset_t *set, struct pt_regs *regs)
{ {
sigset_t *set = sigmask_to_save();
struct rt_sigframe __user *frame; struct rt_sigframe __user *frame;
void __user *fp = NULL; void __user *fp = NULL;
unsigned long uc_flags; unsigned long uc_flags;
@ -560,11 +560,10 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to,
} }
#endif /* CONFIG_X86_X32_ABI */ #endif /* CONFIG_X86_X32_ABI */
static int x32_setup_rt_frame(struct ksignal *ksig, static int x32_setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
compat_sigset_t *set,
struct pt_regs *regs)
{ {
#ifdef CONFIG_X86_X32_ABI #ifdef CONFIG_X86_X32_ABI
compat_sigset_t *set = (compat_sigset_t *) sigmask_to_save();
struct rt_sigframe_x32 __user *frame; struct rt_sigframe_x32 __user *frame;
unsigned long uc_flags; unsigned long uc_flags;
void __user *restorer; void __user *restorer;
@ -763,22 +762,19 @@ static inline int is_x32_frame(struct ksignal *ksig)
static int static int
setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
{ {
sigset_t *set = sigmask_to_save();
compat_sigset_t *cset = (compat_sigset_t *) set;
/* Perform fixup for the pre-signal frame. */ /* Perform fixup for the pre-signal frame. */
rseq_signal_deliver(ksig, regs); rseq_signal_deliver(ksig, regs);
/* Set up the stack frame */ /* Set up the stack frame */
if (is_ia32_frame(ksig)) { if (is_ia32_frame(ksig)) {
if (ksig->ka.sa.sa_flags & SA_SIGINFO) if (ksig->ka.sa.sa_flags & SA_SIGINFO)
return ia32_setup_rt_frame(ksig, cset, regs); return ia32_setup_rt_frame(ksig, regs);
else else
return ia32_setup_frame(ksig, cset, regs); return ia32_setup_frame(ksig, regs);
} else if (is_x32_frame(ksig)) { } else if (is_x32_frame(ksig)) {
return x32_setup_rt_frame(ksig, cset, regs); return x32_setup_rt_frame(ksig, regs);
} else { } else {
return __setup_rt_frame(ksig, set, regs); return __setup_rt_frame(ksig, regs);
} }
} }