x86 signal code cleanups
Subsystems (5)
cover x86 signal code cleanups
The 32-bit signal code has significant differences from 64-bit, and those are duplicated for native and compat modes. This patch series merges the 32-bit code into one file, and does some general cleanups in the x86 signal code. There should be no functional changes.
Brian Gerst (8):
x86/signal: Remove sig parameter from frame setup functions x86/signal: Remove sigset_t parameter from frame setup functions signal/compat: Remove compat_sigset_t override
x86: Remove __USER32_DS
x86/signal: Merge get_sigframe()
x86/signal: Add ABI prefixes to frame setup functions x86/signal/32: Merge native and compat 32-bit signal code x86/signal/64: Move 64-bit signal code to its own file
arch/x86/entry/entry_64_compat.S | 4 +-
arch/x86/ia32/Makefile | 2 -
arch/x86/include/asm/elf.h | 4 -
arch/x86/include/asm/fpu/signal.h | 7 -
arch/x86/include/asm/segment.h | 2 +-
arch/x86/include/asm/sighandling.h | 9 +
arch/x86/include/asm/signal.h | 5 -
arch/x86/kernel/Makefile | 4 +-
arch/x86/kernel/signal.c | 654 +-----------------
.../ia32_signal.c => kernel/signal_32.c} | 117 ++--
arch/x86/kernel/signal_64.c | 383 ++++++++++
arch/x86/xen/xen-asm.S | 8 +-
include/linux/compat.h | 2 -
include/linux/syscalls.h | 2 +
14 files changed, 493 insertions(+), 710 deletions(-)
rename arch/x86/{ia32/ia32_signal.c => kernel/signal_32.c} (82%)
create mode 100644 arch/x86/kernel/signal_64.cSignature · 1 line
2.35.3
PATCH 1/8 x86/signal: Remove sig parameter from frame setup functions
Passing the signal number as a seperate parameter is unnecessary, since it is always ksig->sig.
--- arch/x86/ia32/ia32_signal.c | 12 ++++++------ arch/x86/include/asm/fpu/signal.h | 4 ++-- arch/x86/kernel/signal.c | 23 +++++++++++------------ 3 files changed, 19 insertions(+), 20 deletions(-)
arch/x86/ia32/ia32_signal.c +6 -6
@@ -230,7 +230,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,return (void __user *) sp; } -int ia32_setup_frame (int sig,struct ksignal *ksig, +int ia32_setup_frame (struct ksignal *ksig,compat_sigset_t *set,struct pt_regs *regs) {struct sigframe_ia32 __user *frame;
@@ -264,7 +264,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,if (!user_access_begin (frame,sizeof (*frame)))return -EFAULT ; -unsafe_put_user (sig, &frame->sig, Efault); +unsafe_put_user (ksig->sig, &frame->sig, Efault);unsafe_put_sigcontext32 (&frame->sc, fp, regs, set, Efault);unsafe_put_user (set->sig[1 ], &frame->extramask[0 ], Efault);unsafe_put_user (ptr_to_compat (restorer), &frame->pretcode, Efault);
@@ -280,7 +280,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig, regs->ip = (unsigned long ) ksig->ka.sa.sa_handler;/* Make -mregparm=3 work */ - regs->ax = sig; + regs->ax = ksig->sig; regs->dx =0 ; regs->cx =0 ;
@@ -296,7 +296,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,return -EFAULT ; } -int ia32_setup_rt_frame (int sig,struct ksignal *ksig, +int ia32_setup_rt_frame (struct ksignal *ksig,compat_sigset_t *set,struct pt_regs *regs) {struct rt_sigframe_ia32 __user *frame;
@@ -321,7 +321,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,if (!user_access_begin (frame,sizeof (*frame)))return -EFAULT ; -unsafe_put_user (sig, &frame->sig, Efault); +unsafe_put_user (ksig->sig, &frame->sig, Efault);unsafe_put_user (ptr_to_compat (&frame->info), &frame->pinfo, Efault);unsafe_put_user (ptr_to_compat (&frame->uc), &frame->puc, Efault);
@@ -357,7 +357,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, regs->ip = (unsigned long ) ksig->ka.sa.sa_handler;/* Make -mregparm=3 work */ - regs->ax = sig; + regs->ax = ksig->sig; regs->dx = (unsigned long ) &frame->info; regs->cx = (unsigned long ) &frame->uc;
arch/x86/include/asm/fpu/signal.h +2 -2
@@ -14,9 +14,9 @@# include <uapi/asm/sigcontext.h> # include <asm/user32.h> struct ksignal ; -int ia32_setup_rt_frame (int sig,struct ksignal *ksig, +int ia32_setup_rt_frame (struct ksignal *ksig,compat_sigset_t *set,struct pt_regs *regs); -int ia32_setup_frame (int sig,struct ksignal *ksig, +int ia32_setup_frame (struct ksignal *ksig,compat_sigset_t *set,struct pt_regs *regs);#else # define user_i387_ia32_struct user_i387_struct
arch/x86/kernel/signal.c +11 -12
@@ -324,7 +324,7 @@ static const struct { };static int -__setup_frame (int sig,struct ksignal *ksig,sigset_t *set, +__setup_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) {struct sigframe __user *frame;
@@ -336,7 +336,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,if (!user_access_begin (frame,sizeof (*frame)))return -EFAULT ; -unsafe_put_user (sig, &frame->sig, Efault); +unsafe_put_user (ksig->sig, &frame->sig, Efault);unsafe_put_sigcontext (&frame->sc, fp, regs, set, Efault);unsafe_put_user (set->sig[1 ], &frame->extramask[0 ], Efault);if (current->mm->context.vdso)
@@ -363,7 +363,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,/* Set up registers for signal handler */ regs->sp = (unsigned long )frame; regs->ip = (unsigned long )ksig->ka.sa.sa_handler; - regs->ax = (unsigned long )sig; + regs->ax = (unsigned long )ksig->sig; regs->dx =0 ; regs->cx =0 ;
@@ -379,7 +379,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,return -EFAULT ; } -static int __setup_rt_frame (int sig,struct ksignal *ksig, +static int __setup_rt_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) {struct rt_sigframe __user *frame;
@@ -391,7 +391,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,if (!user_access_begin (frame,sizeof (*frame)))return -EFAULT ; -unsafe_put_user (sig, &frame->sig, Efault); +unsafe_put_user (ksig->sig, &frame->sig, Efault);unsafe_put_user (&frame->info, &frame->pinfo, Efault);unsafe_put_user (&frame->uc, &frame->puc, Efault);
@@ -428,7 +428,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,/* Set up registers for signal handler */ regs->sp = (unsigned long )frame; regs->ip = (unsigned long )ksig->ka.sa.sa_handler; - regs->ax = (unsigned long )sig; + regs->ax = (unsigned long )ksig->sig; regs->dx = (unsigned long )&frame->info; regs->cx = (unsigned long )&frame->uc;
@@ -458,7 +458,7 @@ static unsigned long frame_uc_flags(struct pt_regs *regs)return flags; } -static int __setup_rt_frame (int sig,struct ksignal *ksig, +static int __setup_rt_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) {struct rt_sigframe __user *frame;
@@ -493,7 +493,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, }/* Set up registers for signal handler */ - regs->di = sig; + regs->di = ksig->sig;/* In case the signal handler was declared without prototypes */ regs->ax =0 ;
@@ -763,7 +763,6 @@ static inline int is_x32_frame(struct ksignal *ksig)static int setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { -int usig = ksig->sig;sigset_t *set =sigmask_to_save ();compat_sigset_t *cset = (compat_sigset_t *) set;
@@ -773,13 +772,13 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)/* Set up the stack frame */ if (is_ia32_frame (ksig)) {if (ksig->ka.sa.sa_flags &SA_SIGINFO ) -return ia32_setup_rt_frame (usig, ksig, cset, regs); +return ia32_setup_rt_frame (ksig, cset, regs);else -return ia32_setup_frame (usig, ksig, cset, regs); +return ia32_setup_frame (ksig, cset, regs); }else if (is_x32_frame (ksig)) {return x32_setup_rt_frame (ksig, cset, regs); }else { -return __setup_rt_frame (ksig->sig, ksig, set, regs); +return __setup_rt_frame (ksig, set, regs); } }
Signature · 1 line
2.35.3
[tip: x86/misc] x86/signal: Remove sig parameter from frame setup functions
The following commit has been merged into the x86/misc branch of tip:
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: 8bb2d28e2b92ef220e82369ff31a22f39831cf2f Gitweb: https://git.kernel.org/tip/8bb2d28e2b92ef220e82369ff31a22f39831cf2f Author: Brian Gerst <[email protected]> AuthorDate: Mon, 06 Jun 2022 16:37:55 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 19 Oct 2022 09:58:48 +02:00
x86/signal: Remove sig parameter from frame setup functions
Passing the signal number as a separate parameter is unnecessary, since it is always ksig->sig.
--- arch/x86/ia32/ia32_signal.c | 12 ++++++------ arch/x86/include/asm/fpu/signal.h | 4 ++-- arch/x86/kernel/signal.c | 23 +++++++++++------------ 3 files changed, 19 insertions(+), 20 deletions(-)
arch/x86/ia32/ia32_signal.c +6 -6
@@ -230,7 +230,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,return (void __user *) sp; } -int ia32_setup_frame (int sig,struct ksignal *ksig, +int ia32_setup_frame (struct ksignal *ksig,compat_sigset_t *set,struct pt_regs *regs) {struct sigframe_ia32 __user *frame;
@@ -264,7 +264,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,if (!user_access_begin (frame,sizeof (*frame)))return -EFAULT ; -unsafe_put_user (sig, &frame->sig, Efault); +unsafe_put_user (ksig->sig, &frame->sig, Efault);unsafe_put_sigcontext32 (&frame->sc, fp, regs, set, Efault);unsafe_put_user (set->sig[1 ], &frame->extramask[0 ], Efault);unsafe_put_user (ptr_to_compat (restorer), &frame->pretcode, Efault);
@@ -280,7 +280,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig, regs->ip = (unsigned long ) ksig->ka.sa.sa_handler;/* Make -mregparm=3 work */ - regs->ax = sig; + regs->ax = ksig->sig; regs->dx =0 ; regs->cx =0 ;
@@ -296,7 +296,7 @@ Efault:return -EFAULT ; } -int ia32_setup_rt_frame (int sig,struct ksignal *ksig, +int ia32_setup_rt_frame (struct ksignal *ksig,compat_sigset_t *set,struct pt_regs *regs) {struct rt_sigframe_ia32 __user *frame;
@@ -321,7 +321,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,if (!user_access_begin (frame,sizeof (*frame)))return -EFAULT ; -unsafe_put_user (sig, &frame->sig, Efault); +unsafe_put_user (ksig->sig, &frame->sig, Efault);unsafe_put_user (ptr_to_compat (&frame->info), &frame->pinfo, Efault);unsafe_put_user (ptr_to_compat (&frame->uc), &frame->puc, Efault);
@@ -357,7 +357,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, regs->ip = (unsigned long ) ksig->ka.sa.sa_handler;/* Make -mregparm=3 work */ - regs->ax = sig; + regs->ax = ksig->sig; regs->dx = (unsigned long ) &frame->info; regs->cx = (unsigned long ) &frame->uc;
arch/x86/include/asm/fpu/signal.h +2 -2
@@ -14,9 +14,9 @@# include <uapi/asm/sigcontext.h> # include <asm/user32.h> struct ksignal ; -int ia32_setup_rt_frame (int sig,struct ksignal *ksig, +int ia32_setup_rt_frame (struct ksignal *ksig,compat_sigset_t *set,struct pt_regs *regs); -int ia32_setup_frame (int sig,struct ksignal *ksig, +int ia32_setup_frame (struct ksignal *ksig,compat_sigset_t *set,struct pt_regs *regs);#else # define user_i387_ia32_struct user_i387_struct
arch/x86/kernel/signal.c +11 -12
@@ -324,7 +324,7 @@ static const struct { };static int -__setup_frame (int sig,struct ksignal *ksig,sigset_t *set, +__setup_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) {struct sigframe __user *frame;
@@ -336,7 +336,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,if (!user_access_begin (frame,sizeof (*frame)))return -EFAULT ; -unsafe_put_user (sig, &frame->sig, Efault); +unsafe_put_user (ksig->sig, &frame->sig, Efault);unsafe_put_sigcontext (&frame->sc, fp, regs, set, Efault);unsafe_put_user (set->sig[1 ], &frame->extramask[0 ], Efault);if (current->mm->context.vdso)
@@ -363,7 +363,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,/* Set up registers for signal handler */ regs->sp = (unsigned long )frame; regs->ip = (unsigned long )ksig->ka.sa.sa_handler; - regs->ax = (unsigned long )sig; + regs->ax = (unsigned long )ksig->sig; regs->dx =0 ; regs->cx =0 ;
@@ -379,7 +379,7 @@ Efault:return -EFAULT ; } -static int __setup_rt_frame (int sig,struct ksignal *ksig, +static int __setup_rt_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) {struct rt_sigframe __user *frame;
@@ -391,7 +391,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,if (!user_access_begin (frame,sizeof (*frame)))return -EFAULT ; -unsafe_put_user (sig, &frame->sig, Efault); +unsafe_put_user (ksig->sig, &frame->sig, Efault);unsafe_put_user (&frame->info, &frame->pinfo, Efault);unsafe_put_user (&frame->uc, &frame->puc, Efault);
@@ -428,7 +428,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,/* Set up registers for signal handler */ regs->sp = (unsigned long )frame; regs->ip = (unsigned long )ksig->ka.sa.sa_handler; - regs->ax = (unsigned long )sig; + regs->ax = (unsigned long )ksig->sig; regs->dx = (unsigned long )&frame->info; regs->cx = (unsigned long )&frame->uc;
@@ -458,7 +458,7 @@ static unsigned long frame_uc_flags(struct pt_regs *regs)return flags; } -static int __setup_rt_frame (int sig,struct ksignal *ksig, +static int __setup_rt_frame (struct ksignal *ksig,sigset_t *set,struct pt_regs *regs) {struct rt_sigframe __user *frame;
@@ -493,7 +493,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig, }/* Set up registers for signal handler */ - regs->di = sig; + regs->di = ksig->sig;/* In case the signal handler was declared without prototypes */ regs->ax =0 ;
@@ -763,7 +763,6 @@ static inline int is_x32_frame(struct ksignal *ksig)static int setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { -int usig = ksig->sig;sigset_t *set =sigmask_to_save ();compat_sigset_t *cset = (compat_sigset_t *) set;
@@ -773,13 +772,13 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)/* Set up the stack frame */ if (is_ia32_frame (ksig)) {if (ksig->ka.sa.sa_flags &SA_SIGINFO ) -return ia32_setup_rt_frame (usig, ksig, cset, regs); +return ia32_setup_rt_frame (ksig, cset, regs);else -return ia32_setup_frame (usig, ksig, cset, regs); +return ia32_setup_frame (ksig, cset, regs); }else if (is_x32_frame (ksig)) {return x32_setup_rt_frame (ksig, cset, regs); }else { -return __setup_rt_frame (ksig->sig, ksig, set, regs); +return __setup_rt_frame (ksig, set, regs); } }
PATCH 2/8 x86/signal: Remove sigset_t parameter from frame setup functions
In reply to Brian GerstPush down the call to sigmask_to_save() into the frame setup functions. This removes the use of compat_sigset_t outside of the compat code.
--- arch/x86/ia32/ia32_signal.c | 8 ++++---- arch/x86/include/asm/fpu/signal.h | 6 ++---- arch/x86/include/asm/signal.h | 5 ----- arch/x86/kernel/signal.c | 28 ++++++++++++---------------- 4 files changed, 18 insertions(+), 29 deletions(-)
arch/x86/ia32/ia32_signal.c +4 -4
@@ -230,9 +230,9 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,return (void __user *) sp; } -int ia32_setup_frame (struct ksignal *ksig, -compat_sigset_t *set,struct pt_regs *regs) +int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs) { +compat_sigset_t *set = (compat_sigset_t *)sigmask_to_save ();struct sigframe_ia32 __user *frame;void __user *restorer;void __user *fp =NULL ;
@@ -296,9 +296,9 @@ int ia32_setup_frame(struct ksignal *ksig,return -EFAULT ; } -int ia32_setup_rt_frame (struct ksignal *ksig, -compat_sigset_t *set,struct pt_regs *regs) +int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { +compat_sigset_t *set = (compat_sigset_t *)sigmask_to_save ();struct rt_sigframe_ia32 __user *frame;void __user *restorer;void __user *fp =NULL ;
arch/x86/include/asm/fpu/signal.h +2 -4
@@ -14,10 +14,8 @@# include <uapi/asm/sigcontext.h> # include <asm/user32.h> struct ksignal ; -int ia32_setup_rt_frame (struct ksignal *ksig, -compat_sigset_t *set,struct pt_regs *regs); -int ia32_setup_frame (struct ksignal *ksig, -compat_sigset_t *set,struct pt_regs *regs); +int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); +int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs);#else # define user_i387_ia32_struct user_i387_struct# define user32_fxsr_struct user_fxsr_struct
arch/x86/include/asm/signal.h +0 -5
@@ -28,11 +28,6 @@ typedef struct {#define SA_IA32_ABI 0x02000000u#define SA_X32_ABI 0x01000000u -#ifndef CONFIG_COMPAT -#define compat_sigset_t compat_sigset_t -typedef sigset_t compat_sigset_t ; -#endif -#endif /* __ASSEMBLY__ */ #include <uapi/asm/signal.h> #ifndef __ASSEMBLY__
arch/x86/kernel/signal.c +12 -16
@@ -324,9 +324,9 @@ static const struct { };static int -__setup_frame (struct ksignal *ksig,sigset_t *set, -struct pt_regs *regs) +__setup_frame (struct ksignal *ksig,struct pt_regs *regs) { +sigset_t *set =sigmask_to_save ();struct sigframe __user *frame;void __user *restorer;void __user *fp =NULL ;
@@ -379,9 +379,9 @@ __setup_frame(struct ksignal *ksig, sigset_t *set,return -EFAULT ; } -static int __setup_rt_frame (struct ksignal *ksig, -sigset_t *set,struct pt_regs *regs) +static int __setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { +sigset_t *set =sigmask_to_save ();struct rt_sigframe __user *frame;void __user *restorer;void __user *fp =NULL ;
@@ -458,9 +458,9 @@ static unsigned long frame_uc_flags(struct pt_regs *regs)return flags; } -static int __setup_rt_frame (struct ksignal *ksig, -sigset_t *set,struct pt_regs *regs) +static int __setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { +sigset_t *set =sigmask_to_save ();struct rt_sigframe __user *frame;void __user *fp =NULL ;unsigned long uc_flags;
@@ -560,11 +560,10 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to, }#endif /* CONFIG_X86_X32_ABI */ -static int x32_setup_rt_frame (struct ksignal *ksig, -compat_sigset_t *set, -struct pt_regs *regs) +static int x32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) {#ifdef CONFIG_X86_X32_ABI +compat_sigset_t *set = (compat_sigset_t *)sigmask_to_save ();struct rt_sigframe_x32 __user *frame;unsigned long uc_flags;void __user *restorer;
@@ -763,22 +762,19 @@ static inline int is_x32_frame(struct ksignal *ksig)static int 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. */ rseq_signal_deliver (ksig, regs);/* Set up the stack frame */ if (is_ia32_frame (ksig)) {if (ksig->ka.sa.sa_flags &SA_SIGINFO ) -return ia32_setup_rt_frame (ksig, cset, regs); +return ia32_setup_rt_frame (ksig, regs);else -return ia32_setup_frame (ksig, cset, regs); +return ia32_setup_frame (ksig, regs); }else if (is_x32_frame (ksig)) { -return x32_setup_rt_frame (ksig, cset, regs); +return x32_setup_rt_frame (ksig, regs); }else { -return __setup_rt_frame (ksig, set, regs); +return __setup_rt_frame (ksig, regs); } }
Signature · 1 line
2.35.3
[tip: x86/misc] x86/signal: Remove sigset_t parameter from frame setup functions
The following commit has been merged into the x86/misc branch of tip:
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: f544822ea587ce08932640d5ba3978261148cbc7 Gitweb: https://git.kernel.org/tip/f544822ea587ce08932640d5ba3978261148cbc7 Author: Brian Gerst <[email protected]> AuthorDate: Mon, 06 Jun 2022 16:37:56 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 19 Oct 2022 09:58:48 +02:00
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.
--- arch/x86/ia32/ia32_signal.c | 8 ++++---- arch/x86/include/asm/fpu/signal.h | 6 ++---- arch/x86/include/asm/signal.h | 5 ----- arch/x86/kernel/signal.c | 28 ++++++++++++---------------- 4 files changed, 18 insertions(+), 29 deletions(-)
arch/x86/ia32/ia32_signal.c +4 -4
@@ -230,9 +230,9 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,return (void __user *) sp; } -int ia32_setup_frame (struct ksignal *ksig, -compat_sigset_t *set,struct pt_regs *regs) +int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs) { +compat_sigset_t *set = (compat_sigset_t *)sigmask_to_save ();struct sigframe_ia32 __user *frame;void __user *restorer;void __user *fp =NULL ;
@@ -296,9 +296,9 @@ Efault:return -EFAULT ; } -int ia32_setup_rt_frame (struct ksignal *ksig, -compat_sigset_t *set,struct pt_regs *regs) +int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { +compat_sigset_t *set = (compat_sigset_t *)sigmask_to_save ();struct rt_sigframe_ia32 __user *frame;void __user *restorer;void __user *fp =NULL ;
arch/x86/include/asm/fpu/signal.h +2 -4
@@ -14,10 +14,8 @@# include <uapi/asm/sigcontext.h> # include <asm/user32.h> struct ksignal ; -int ia32_setup_rt_frame (struct ksignal *ksig, -compat_sigset_t *set,struct pt_regs *regs); -int ia32_setup_frame (struct ksignal *ksig, -compat_sigset_t *set,struct pt_regs *regs); +int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); +int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs);#else # define user_i387_ia32_struct user_i387_struct# define user32_fxsr_struct user_fxsr_struct
arch/x86/include/asm/signal.h +0 -5
@@ -28,11 +28,6 @@ typedef struct {#define SA_IA32_ABI 0x02000000u#define SA_X32_ABI 0x01000000u -#ifndef CONFIG_COMPAT -#define compat_sigset_t compat_sigset_t -typedef sigset_t compat_sigset_t ; -#endif -#endif /* __ASSEMBLY__ */ #include <uapi/asm/signal.h> #ifndef __ASSEMBLY__
arch/x86/kernel/signal.c +12 -16
@@ -324,9 +324,9 @@ static const struct { };static int -__setup_frame (struct ksignal *ksig,sigset_t *set, -struct pt_regs *regs) +__setup_frame (struct ksignal *ksig,struct pt_regs *regs) { +sigset_t *set =sigmask_to_save ();struct sigframe __user *frame;void __user *restorer;void __user *fp =NULL ;
@@ -379,9 +379,9 @@ Efault:return -EFAULT ; } -static int __setup_rt_frame (struct ksignal *ksig, -sigset_t *set,struct pt_regs *regs) +static int __setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { +sigset_t *set =sigmask_to_save ();struct rt_sigframe __user *frame;void __user *restorer;void __user *fp =NULL ;
@@ -458,9 +458,9 @@ static unsigned long frame_uc_flags(struct pt_regs *regs)return flags; } -static int __setup_rt_frame (struct ksignal *ksig, -sigset_t *set,struct pt_regs *regs) +static int __setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { +sigset_t *set =sigmask_to_save ();struct rt_sigframe __user *frame;void __user *fp =NULL ;unsigned long uc_flags;
@@ -560,11 +560,10 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to, }#endif /* CONFIG_X86_X32_ABI */ -static int x32_setup_rt_frame (struct ksignal *ksig, -compat_sigset_t *set, -struct pt_regs *regs) +static int x32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) {#ifdef CONFIG_X86_X32_ABI +compat_sigset_t *set = (compat_sigset_t *)sigmask_to_save ();struct rt_sigframe_x32 __user *frame;unsigned long uc_flags;void __user *restorer;
@@ -763,22 +762,19 @@ static inline int is_x32_frame(struct ksignal *ksig)static int 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. */ rseq_signal_deliver (ksig, regs);/* Set up the stack frame */ if (is_ia32_frame (ksig)) {if (ksig->ka.sa.sa_flags &SA_SIGINFO ) -return ia32_setup_rt_frame (ksig, cset, regs); +return ia32_setup_rt_frame (ksig, regs);else -return ia32_setup_frame (ksig, cset, regs); +return ia32_setup_frame (ksig, regs); }else if (is_x32_frame (ksig)) { -return x32_setup_rt_frame (ksig, cset, regs); +return x32_setup_rt_frame (ksig, regs); }else { -return __setup_rt_frame (ksig, set, regs); +return __setup_rt_frame (ksig, regs); } }
PATCH 3/8 signal/compat: Remove compat_sigset_t override
In reply to Brian Gerstx86 no longer uses compat_sigset_t when CONFIG_COMPAT isn't enabled, so remove the override define.
--- include/linux/compat.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/compat.h +0 -2
@@ -126,11 +126,9 @@ struct compat_tms {#define _COMPAT_NSIG_WORDS (_COMPAT_NSIG / _COMPAT_NSIG_BPW) -#ifndef compat_sigset_ttypedef struct {compat_sigset_word sig[_COMPAT_NSIG_WORDS]; }compat_sigset_t ; -#endif int set_compat_user_sigmask (const compat_sigset_t __user *umask,size_t sigsetsize);
Signature · 1 line
2.35.3
[tip: x86/misc] signal/compat: Remove compat_sigset_t override
The following commit has been merged into the x86/misc branch of tip:
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: 653714220f88717f239d811222c2dd0e64b181ba Gitweb: https://git.kernel.org/tip/653714220f88717f239d811222c2dd0e64b181ba Author: Brian Gerst <[email protected]> AuthorDate: Mon, 06 Jun 2022 16:37:57 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 19 Oct 2022 09:58:49 +02:00
signal/compat: Remove compat_sigset_t override
x86 no longer uses compat_sigset_t when CONFIG_COMPAT isn't enabled, so remove the override define.
--- include/linux/compat.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/compat.h +0 -2
@@ -126,11 +126,9 @@ struct compat_tms {#define _COMPAT_NSIG_WORDS (_COMPAT_NSIG / _COMPAT_NSIG_BPW) -#ifndef compat_sigset_ttypedef struct {compat_sigset_word sig[_COMPAT_NSIG_WORDS]; }compat_sigset_t ; -#endif int set_compat_user_sigmask (const compat_sigset_t __user *umask,size_t sigsetsize);
PATCH 4/8 x86: Remove __USER32_DS
In reply to Brian GerstReplace all users with the equivalent __USER_DS, which will make merging native and compat code simpler.
--- arch/x86/entry/entry_64_compat.S | 4 ++-- arch/x86/ia32/ia32_signal.c | 14 +++++++------- arch/x86/include/asm/elf.h | 4 ---- arch/x86/include/asm/segment.h | 1 - arch/x86/xen/xen-asm.S | 8 ++++---- 5 files changed, 13 insertions(+), 18 deletions(-)
arch/x86/entry/entry_64_compat.S +2 -2
@@ -59,7 +59,7 @@ SYM_CODE_START(entry_SYSENTER_compat) movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp /* Construct struct pt_regs on stack */ - pushq $__USER32_DS /* pt_regs->ss */ + pushq $__USER_DS /* pt_regs->ss */ pushq $0 /* pt_regs->sp = 0 (placeholder) */ /*
@@ -192,7 +192,7 @@ SYM_INNER_LABEL(entry_SYSCALL_compat_safe_stack, SYM_L_GLOBAL) ANNOTATE_NOENDBR /* Construct struct pt_regs on stack */ - pushq $__USER32_DS /* pt_regs->ss */ + pushq $__USER_DS /* pt_regs->ss */ pushq %r8 /* pt_regs->sp */ pushq %r11 /* pt_regs->flags */ pushq $__USER32_CS /* pt_regs->cs */
arch/x86/ia32/ia32_signal.c +7 -7
@@ -212,7 +212,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,if (ksig->ka.sa.sa_flags &SA_ONSTACK ) sp =sigsp (sp, ksig);/* This is the legacy signal stack switching. */ -else if (regs->ss != __USER32_DS && +else if (regs->ss != __USER_DS && !(ksig->ka.sa.sa_flags &SA_RESTORER ) && ksig->ka.sa.sa_restorer) sp = (unsigned long ) ksig->ka.sa.sa_restorer;
@@ -284,11 +284,11 @@ int ia32_setup_frame(struct ksignal *ksig, struct pt_regs *regs) regs->dx =0 ; regs->cx =0 ; -loadsegment (ds, __USER32_DS); -loadsegment (es, __USER32_DS); +loadsegment (ds, __USER_DS); +loadsegment (es, __USER_DS); regs->cs = __USER32_CS; - regs->ss = __USER32_DS; + regs->ss = __USER_DS;return 0 ; Efault:
@@ -361,11 +361,11 @@ int ia32_setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) regs->dx = (unsigned long ) &frame->info; regs->cx = (unsigned long ) &frame->uc; -loadsegment (ds, __USER32_DS); -loadsegment (es, __USER32_DS); +loadsegment (ds, __USER_DS); +loadsegment (es, __USER_DS); regs->cs = __USER32_CS; - regs->ss = __USER32_DS; + regs->ss = __USER_DS;return 0 ; Efault:
arch/x86/include/asm/elf.h +0 -4
@@ -152,10 +152,6 @@ do { \ (elf_check_arch_ia32 (x) || \ (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64)) -#if __USER32_DS != __USER_DS -# error "The following code assumes __USER32_DS == __USER_DS" -#endif -static inline void elf_common_init (struct thread_struct *t,struct pt_regs *regs,const u16 ds) {
arch/x86/include/asm/segment.h +0 -1
@@ -210,7 +210,6 @@#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)#define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8 + 3)#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3) -#define __USER32_DS __USER_DS#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8 + 3)#define __CPUNODE_SEG (GDT_ENTRY_CPUNODE*8 + 3)
arch/x86/xen/xen-asm.S +4 -4
@@ -262,10 +262,10 @@ SYM_CODE_START(xen_syscall32_target) /* * Neither Xen nor the kernel really knows what the old SS and - * CS were. The kernel expects __USER32_DS and __USER32_CS, so + * CS were. The kernel expects __USER_DS and __USER32_CS, so * report those values even though Xen will guess its own values. */ - movq $__USER32_DS, 4*8(%rsp) + movq $__USER_DS, 4*8(%rsp) movq $__USER32_CS, 1*8(%rsp) jmp entry_SYSCALL_compat_after_hwframe
@@ -284,10 +284,10 @@ SYM_CODE_START(xen_sysenter_target) /* * Neither Xen nor the kernel really knows what the old SS and - * CS were. The kernel expects __USER32_DS and __USER32_CS, so + * CS were. The kernel expects __USER_DS and __USER32_CS, so * report those values even though Xen will guess its own values. */ - movq $__USER32_DS, 4*8(%rsp) + movq $__USER_DS, 4*8(%rsp) movq $__USER32_CS, 1*8(%rsp) jmp entry_SYSENTER_compat_after_hwframe
Signature · 1 line
2.35.3
[tip: x86/misc] x86: Remove __USER32_DS
The following commit has been merged into the x86/misc branch of tip:
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: 695c39bc5b8686a6b27254e60fb830f4989f322d Gitweb: https://git.kernel.org/tip/695c39bc5b8686a6b27254e60fb830f4989f322d Author: Brian Gerst <[email protected]> AuthorDate: Mon, 06 Jun 2022 16:37:58 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 19 Oct 2022 09:58:49 +02:00
x86: Remove __USER32_DS
Replace all users with the equivalent __USER_DS, which will make merging native and compat code simpler.
--- arch/x86/entry/entry_64_compat.S | 4 ++-- arch/x86/ia32/ia32_signal.c | 14 +++++++------- arch/x86/include/asm/elf.h | 4 ---- arch/x86/include/asm/segment.h | 1 - arch/x86/xen/xen-asm.S | 8 ++++---- 5 files changed, 13 insertions(+), 18 deletions(-)
arch/x86/entry/entry_64_compat.S +2 -2
@@ -61,7 +61,7 @@ SYM_CODE_START(entry_SYSENTER_compat) movq PER_CPU_VAR(cpu_current_top_of_stack), %rsp /* Construct struct pt_regs on stack */ - pushq $__USER32_DS /* pt_regs->ss */ + pushq $__USER_DS /* pt_regs->ss */ pushq $0 /* pt_regs->sp = 0 (placeholder) */ /*
@@ -197,7 +197,7 @@ SYM_INNER_LABEL(entry_SYSCALL_compat_safe_stack, SYM_L_GLOBAL) ANNOTATE_NOENDBR /* Construct struct pt_regs on stack */ - pushq $__USER32_DS /* pt_regs->ss */ + pushq $__USER_DS /* pt_regs->ss */ pushq %r8 /* pt_regs->sp */ pushq %r11 /* pt_regs->flags */ pushq $__USER32_CS /* pt_regs->cs */
arch/x86/ia32/ia32_signal.c +7 -7
@@ -212,7 +212,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,if (ksig->ka.sa.sa_flags &SA_ONSTACK ) sp =sigsp (sp, ksig);/* This is the legacy signal stack switching. */ -else if (regs->ss != __USER32_DS && +else if (regs->ss != __USER_DS && !(ksig->ka.sa.sa_flags &SA_RESTORER ) && ksig->ka.sa.sa_restorer) sp = (unsigned long ) ksig->ka.sa.sa_restorer;
@@ -284,11 +284,11 @@ int ia32_setup_frame(struct ksignal *ksig, struct pt_regs *regs) regs->dx =0 ; regs->cx =0 ; -loadsegment (ds, __USER32_DS); -loadsegment (es, __USER32_DS); +loadsegment (ds, __USER_DS); +loadsegment (es, __USER_DS); regs->cs = __USER32_CS; - regs->ss = __USER32_DS; + regs->ss = __USER_DS;return 0 ; Efault:
@@ -361,11 +361,11 @@ int ia32_setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) regs->dx = (unsigned long ) &frame->info; regs->cx = (unsigned long ) &frame->uc; -loadsegment (ds, __USER32_DS); -loadsegment (es, __USER32_DS); +loadsegment (ds, __USER_DS); +loadsegment (es, __USER_DS); regs->cs = __USER32_CS; - regs->ss = __USER32_DS; + regs->ss = __USER_DS;return 0 ; Efault:
arch/x86/include/asm/elf.h +0 -4
@@ -152,10 +152,6 @@ do { \ (elf_check_arch_ia32 (x) || \ (IS_ENABLED(CONFIG_X86_X32_ABI) && (x)->e_machine == EM_X86_64)) -#if __USER32_DS != __USER_DS -# error "The following code assumes __USER32_DS == __USER_DS" -#endif -static inline void elf_common_init (struct thread_struct *t,struct pt_regs *regs,const u16 ds) {
arch/x86/include/asm/segment.h +0 -1
@@ -210,7 +210,6 @@#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)#define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8 + 3)#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3) -#define __USER32_DS __USER_DS#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8 + 3)#define __CPUNODE_SEG (GDT_ENTRY_CPUNODE*8 + 3)
arch/x86/xen/xen-asm.S +4 -4
@@ -262,10 +262,10 @@ SYM_CODE_START(xen_entry_SYSCALL_compat) /* * Neither Xen nor the kernel really knows what the old SS and - * CS were. The kernel expects __USER32_DS and __USER32_CS, so + * CS were. The kernel expects __USER_DS and __USER32_CS, so * report those values even though Xen will guess its own values. */ - movq $__USER32_DS, 4*8(%rsp) + movq $__USER_DS, 4*8(%rsp) movq $__USER32_CS, 1*8(%rsp) jmp entry_SYSCALL_compat_after_hwframe
@@ -284,10 +284,10 @@ SYM_CODE_START(xen_entry_SYSENTER_compat) /* * Neither Xen nor the kernel really knows what the old SS and - * CS were. The kernel expects __USER32_DS and __USER32_CS, so + * CS were. The kernel expects __USER_DS and __USER32_CS, so * report those values even though Xen will guess its own values. */ - movq $__USER32_DS, 4*8(%rsp) + movq $__USER_DS, 4*8(%rsp) movq $__USER32_CS, 1*8(%rsp) jmp entry_SYSENTER_compat_after_hwframe
PATCH 5/8 x86/signal: Merge get_sigframe()
In reply to Brian GerstAdapt the native get_sigframe() function so that the compat signal code can use it.
--- arch/x86/ia32/ia32_signal.c | 34 ------------- arch/x86/include/asm/sighandling.h | 4 ++ arch/x86/kernel/signal.c | 80 ++++++++++++++---------------- 3 files changed, 42 insertions(+), 76 deletions(-)
arch/x86/ia32/ia32_signal.c +0 -34
@@ -196,40 +196,6 @@ do { \ goto label; \ }while (0 ) -/* -* Determine which stack to use.. -*/ -static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, -size_t frame_size, -void __user **fpstate) -{ -unsigned long sp, fx_aligned, math_size; - -/* Default to using normal stack */ - sp = regs->sp; - -/* This is the X/Open sanctioned signal stack switching. */ -if (ksig->ka.sa.sa_flags &SA_ONSTACK ) - sp =sigsp (sp, ksig); -/* This is the legacy signal stack switching. */ -else if (regs->ss != __USER_DS && - !(ksig->ka.sa.sa_flags &SA_RESTORER ) && - ksig->ka.sa.sa_restorer) - sp = (unsigned long ) ksig->ka.sa.sa_restorer; - - 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)) -return (void __user *)-1L ; - - sp -= frame_size; -/* Align the stack pointer according to the i386 ABI, -* i.e. so that on function entry ((sp + 4) & 15) == 0. */ - sp = ((sp +4 ) &-16ul ) -4 ; -return (void __user *) sp; -} - int ia32_setup_frame(struct ksignal *ksig, struct pt_regs *regs) { compat_sigset_t *set = (compat_sigset_t *) sigmask_to_save();
arch/x86/include/asm/sighandling.h +4 -0
@@ -15,4 +15,8 @@void signal_fault (struct pt_regs *regs,void __user *frame,char *where); +void __user * +get_sigframe (struct ksignal *ksig,struct pt_regs *regs,size_t frame_size, +void __user **fpstate); +#endif /* _ASM_X86_SIGHANDLING_H */
arch/x86/kernel/signal.c +38 -42
144 lines not on this page · raw message
Signature · 1 line
2.35.3
[tip: x86/misc] x86/signal: Merge get_sigframe()
The following commit has been merged into the x86/misc branch of tip:
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: 9c36e592b3f899c90b9d0d46ae29fcc065051b96 Gitweb: https://git.kernel.org/tip/9c36e592b3f899c90b9d0d46ae29fcc065051b96 Author: Brian Gerst <[email protected]> AuthorDate: Mon, 06 Jun 2022 16:37:59 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 19 Oct 2022 09:58:49 +02:00
x86/signal: Merge get_sigframe()
Adapt the native get_sigframe() function so that the compat signal code can use it.
--- arch/x86/ia32/ia32_signal.c | 34 +------------ arch/x86/include/asm/sighandling.h | 4 +- arch/x86/kernel/signal.c | 80 +++++++++++++---------------- 3 files changed, 42 insertions(+), 76 deletions(-)
arch/x86/ia32/ia32_signal.c +0 -34
@@ -196,40 +196,6 @@ do { \ goto label; \ }while (0 ) -/* -* Determine which stack to use.. -*/ -static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs, -size_t frame_size, -void __user **fpstate) -{ -unsigned long sp, fx_aligned, math_size; - -/* Default to using normal stack */ - sp = regs->sp; - -/* This is the X/Open sanctioned signal stack switching. */ -if (ksig->ka.sa.sa_flags &SA_ONSTACK ) - sp =sigsp (sp, ksig); -/* This is the legacy signal stack switching. */ -else if (regs->ss != __USER_DS && - !(ksig->ka.sa.sa_flags &SA_RESTORER ) && - ksig->ka.sa.sa_restorer) - sp = (unsigned long ) ksig->ka.sa.sa_restorer; - - 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)) -return (void __user *)-1L ; - - sp -= frame_size; -/* Align the stack pointer according to the i386 ABI, -* i.e. so that on function entry ((sp + 4) & 15) == 0. */ - sp = ((sp +4 ) &-16ul ) -4 ; -return (void __user *) sp; -} - int ia32_setup_frame(struct ksignal *ksig, struct pt_regs *regs) { compat_sigset_t *set = (compat_sigset_t *) sigmask_to_save();
arch/x86/include/asm/sighandling.h +4 -0
@@ -15,4 +15,8 @@void signal_fault (struct pt_regs *regs,void __user *frame,char *where); +void __user * +get_sigframe (struct ksignal *ksig,struct pt_regs *regs,size_t frame_size, +void __user **fpstate); +#endif /* _ASM_X86_SIGHANDLING_H */
arch/x86/kernel/signal.c +38 -42
144 lines not on this page · raw message
PATCH 6/8 x86/signal: Add ABI prefixes to frame setup functions
In reply to Brian GerstAdd ABI prefixes to the frame setup functions that didn't already have them. To avoid compiler warnings and prepare for moving these functions to separate files, make them non-static.
--- arch/x86/include/asm/fpu/signal.h | 5 ----- arch/x86/include/asm/sighandling.h | 5 +++++ arch/x86/kernel/signal.c | 18 +++++++----------- 3 files changed, 12 insertions(+), 16 deletions(-)
arch/x86/include/asm/fpu/signal.h +0 -5
@@ -13,14 +13,9 @@#ifdef CONFIG_X86_64 # include <uapi/asm/sigcontext.h> # include <asm/user32.h> -struct ksignal ; -int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); -int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs);#else # define user_i387_ia32_struct user_i387_struct# define user32_fxsr_struct user_fxsr_struct -# define ia32_setup_frame __setup_frame -# define ia32_setup_rt_frame __setup_rt_frame#endif extern void convert_from_fxsr(struct user_i387_ia32_struct *env,
arch/x86/include/asm/sighandling.h +5 -0
@@ -19,4 +19,9 @@ void __user * get_sigframe(struct ksignal *ksig, struct pt_regs *regs, size_t frame_size, void __user **fpstate); +int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs); +int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); +int x64_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); +int x32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); +#endif /* _ASM_X86_SIGHANDLING_H */
arch/x86/kernel/signal.c +7 -11
@@ -336,8 +336,7 @@ static const struct { 0 }; -static int -__setup_frame (struct ksignal *ksig,struct pt_regs *regs) +int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs) {sigset_t *set =sigmask_to_save ();struct sigframe __user *frame;
@@ -392,7 +391,7 @@ __setup_frame(struct ksignal *ksig, struct pt_regs *regs)return -EFAULT ; } -static int __setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) +int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) {sigset_t *set =sigmask_to_save ();struct rt_sigframe __user *frame;
@@ -471,7 +470,7 @@ static unsigned long frame_uc_flags(struct pt_regs *regs)return flags; } -static int __setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) +int x64_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) {sigset_t *set =sigmask_to_save ();struct rt_sigframe __user *frame;
@@ -571,11 +570,9 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to,return x32_copy_siginfo_to_user (to, from);return __copy_siginfo_to_user32 (to, from); } -#endif /* CONFIG_X86_X32_ABI */ -static int x32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) +int x32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { -#ifdef CONFIG_X86_X32_ABI compat_sigset_t *set = (compat_sigset_t *)sigmask_to_save ();struct rt_sigframe_x32 __user *frame;unsigned long uc_flags;
@@ -622,15 +619,14 @@ static int x32_setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) regs->cs = __USER_CS; regs->ss = __USER_DS; -#endif /* CONFIG_X86_X32_ABI */ return 0 ; -#ifdef CONFIG_X86_X32_ABI + Efault:user_access_end (); return -EFAULT; -#endif } +#endif /* CONFIG_X86_X32_ABI */ /* * Do a signal return; undo the signal stack.
@@ -770,7 +766,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) }else if (is_x32_frame (ksig)) {return x32_setup_rt_frame (ksig, regs); }else { -return __setup_rt_frame (ksig, regs); +return x64_setup_rt_frame (ksig, regs); } }
Signature · 1 line
2.35.3
[tip: x86/misc] x86/signal: Add ABI prefixes to frame setup functions
The following commit has been merged into the x86/misc branch of tip:
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: c461ae39373a1ae21952dbb6e2668a693d9f761d Gitweb: https://git.kernel.org/tip/c461ae39373a1ae21952dbb6e2668a693d9f761d Author: Brian Gerst <[email protected]> AuthorDate: Mon, 06 Jun 2022 16:38:00 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 19 Oct 2022 09:58:49 +02:00
x86/signal: Add ABI prefixes to frame setup functions
Add ABI prefixes to the frame setup functions that didn't already have them. To avoid compiler warnings and prepare for moving these functions to separate files, make them non-static.
--- arch/x86/include/asm/fpu/signal.h | 5 ----- arch/x86/include/asm/sighandling.h | 5 +++++ arch/x86/kernel/signal.c | 18 +++++++----------- 3 files changed, 12 insertions(+), 16 deletions(-)
arch/x86/include/asm/fpu/signal.h +0 -5
@@ -13,14 +13,9 @@#ifdef CONFIG_X86_64 # include <uapi/asm/sigcontext.h> # include <asm/user32.h> -struct ksignal ; -int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); -int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs);#else # define user_i387_ia32_struct user_i387_struct# define user32_fxsr_struct user_fxsr_struct -# define ia32_setup_frame __setup_frame -# define ia32_setup_rt_frame __setup_rt_frame#endif extern void convert_from_fxsr(struct user_i387_ia32_struct *env,
arch/x86/include/asm/sighandling.h +5 -0
@@ -19,4 +19,9 @@ void __user * get_sigframe(struct ksignal *ksig, struct pt_regs *regs, size_t frame_size, void __user **fpstate); +int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs); +int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); +int x64_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); +int x32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs); +#endif /* _ASM_X86_SIGHANDLING_H */
arch/x86/kernel/signal.c +7 -11
@@ -336,8 +336,7 @@ static const struct { 0 }; -static int -__setup_frame (struct ksignal *ksig,struct pt_regs *regs) +int ia32_setup_frame (struct ksignal *ksig,struct pt_regs *regs) {sigset_t *set =sigmask_to_save ();struct sigframe __user *frame;
@@ -392,7 +391,7 @@ Efault:return -EFAULT ; } -static int __setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) +int ia32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) {sigset_t *set =sigmask_to_save ();struct rt_sigframe __user *frame;
@@ -471,7 +470,7 @@ static unsigned long frame_uc_flags(struct pt_regs *regs)return flags; } -static int __setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) +int x64_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) {sigset_t *set =sigmask_to_save ();struct rt_sigframe __user *frame;
@@ -571,11 +570,9 @@ int copy_siginfo_to_user32(struct compat_siginfo __user *to,return x32_copy_siginfo_to_user (to, from);return __copy_siginfo_to_user32 (to, from); } -#endif /* CONFIG_X86_X32_ABI */ -static int x32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) +int x32_setup_rt_frame (struct ksignal *ksig,struct pt_regs *regs) { -#ifdef CONFIG_X86_X32_ABI compat_sigset_t *set = (compat_sigset_t *)sigmask_to_save ();struct rt_sigframe_x32 __user *frame;unsigned long uc_flags;
@@ -622,15 +619,14 @@ static int x32_setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) regs->cs = __USER_CS; regs->ss = __USER_DS; -#endif /* CONFIG_X86_X32_ABI */ return 0 ; -#ifdef CONFIG_X86_X32_ABI + Efault:user_access_end (); return -EFAULT; -#endif } +#endif /* CONFIG_X86_X32_ABI */ /* * Do a signal return; undo the signal stack.
@@ -770,7 +766,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs) }else if (is_x32_frame (ksig)) {return x32_setup_rt_frame (ksig, regs); }else { -return __setup_rt_frame (ksig, regs); +return x64_setup_rt_frame (ksig, regs); } }
PATCH 7/8 x86/signal/32: Merge native and compat 32-bit signal code
In reply to Brian GerstThere are significant differences between signal handling on 32-bit vs. 64-bit, like different structure layouts and legacy syscalls. Instead of duplicating that code for native and compat, merge both versions into one file.
---
arch/x86/ia32/Makefile | 2 -
arch/x86/include/asm/segment.h | 1 +
arch/x86/kernel/Makefile | 4 +-
arch/x86/kernel/signal.c | 219 +-----------------
.../ia32_signal.c => kernel/signal_32.c} | 59 ++++-
include/linux/syscalls.h | 2 +
6 files changed, 60 insertions(+), 227 deletions(-)
rename arch/x86/{ia32/ia32_signal.c => kernel/signal_32.c} (86%)arch/x86/ia32/Makefile +0 -2
@@ -3,7 +3,5 @@ # Makefile for the ia32 kernel emulation subsystem. # -obj-$(CONFIG_IA32_EMULATION) := ia32_signal.o - audit-class-$(CONFIG_AUDIT) := audit.o obj-$(CONFIG_IA32_EMULATION) += $(audit-class-y)
arch/x86/include/asm/segment.h +1 -0
@@ -135,6 +135,7 @@#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8 + 3) +#define __USER32_CS __USER_CS#define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS*8)/* segment for calling fn: */
arch/x86/kernel/Makefile +2 -2
@@ -57,8 +57,8 @@ obj-y += setup.o x86_init.o i8259.o irqinit.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o -obj-$(CONFIG_X86_32) += sys_ia32.o -obj-$(CONFIG_IA32_EMULATION) += sys_ia32.o +obj-$(CONFIG_X86_32) += sys_ia32.o signal_32.o +obj-$(CONFIG_IA32_EMULATION) += sys_ia32.o signal_32.o obj-$(CONFIG_X86_64) += sys_x86_64.o obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o obj-$(CONFIG_SYSFS) += ksysfs.o
arch/x86/kernel/signal.c +6 -213
315 lines not on this page · raw message
arch/x86/kernel/signal_32.c renamed from arch/x86/ia32/ia32_signal.c +49 -10
158 lines not on this page · raw message
include/linux/syscalls.h +2 -0
@@ -264,6 +264,7 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event)#define SC_VAL64 (type, name) ((type) name##_hi << 32 | name##_lo)#ifdef CONFIG_COMPAT +#define SYSCALL32_DEFINE0 COMPAT_SYSCALL_DEFINE0#define SYSCALL32_DEFINE1 COMPAT_SYSCALL_DEFINE1#define SYSCALL32_DEFINE2 COMPAT_SYSCALL_DEFINE2#define SYSCALL32_DEFINE3 COMPAT_SYSCALL_DEFINE3
@@ -271,6 +272,7 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event)#define SYSCALL32_DEFINE5 COMPAT_SYSCALL_DEFINE5#define SYSCALL32_DEFINE6 COMPAT_SYSCALL_DEFINE6#else +#define SYSCALL32_DEFINE0 SYSCALL_DEFINE0#define SYSCALL32_DEFINE1 SYSCALL_DEFINE1#define SYSCALL32_DEFINE2 SYSCALL_DEFINE2#define SYSCALL32_DEFINE3 SYSCALL_DEFINE3
Signature · 1 line
2.35.3
[tip: x86/misc] x86/signal/32: Merge native and compat 32-bit signal code
The following commit has been merged into the x86/misc branch of tip:
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: 24e6dc35ccd825de7c71751610ff8f3295347e5b Gitweb: https://git.kernel.org/tip/24e6dc35ccd825de7c71751610ff8f3295347e5b Author: Brian Gerst <[email protected]> AuthorDate: Mon, 06 Jun 2022 16:38:01 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 19 Oct 2022 09:58:49 +02:00
x86/signal/32: Merge native and compat 32-bit signal code
There are significant differences between signal handling on 32-bit vs. 64-bit, like different structure layouts and legacy syscalls. Instead of duplicating that code for native and compat, merge both versions into one file.
--- arch/x86/ia32/Makefile | 2 +- arch/x86/ia32/ia32_signal.c | 340 +----------------------------- arch/x86/include/asm/segment.h | 1 +- arch/x86/kernel/Makefile | 4 +- arch/x86/kernel/signal.c | 219 +------------------ arch/x86/kernel/signal_32.c | 379 ++++++++++++++++++++++++++++++++- include/linux/syscalls.h | 2 +- 7 files changed, 390 insertions(+), 557 deletions(-) delete mode 100644 arch/x86/ia32/ia32_signal.c create mode 100644 arch/x86/kernel/signal_32.c
arch/x86/ia32/Makefile +0 -2
@@ -3,7 +3,5 @@ # Makefile for the ia32 kernel emulation subsystem. # -obj-$(CONFIG_IA32_EMULATION) := ia32_signal.o - audit-class-$(CONFIG_AUDIT) := audit.o obj-$(CONFIG_IA32_EMULATION) += $(audit-class-y)
arch/x86/ia32/ia32_signal.c deleted +0 -340
340 lines not on this page · raw message
arch/x86/include/asm/segment.h +1 -0
@@ -135,6 +135,7 @@#define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)#define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8 + 3)#define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8 + 3) +#define __USER32_CS __USER_CS#define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS*8)/* segment for calling fn: */
arch/x86/kernel/Makefile +2 -2
@@ -53,8 +53,8 @@ obj-y += setup.o x86_init.o i8259.o irqinit.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o -obj-$(CONFIG_X86_32) += sys_ia32.o -obj-$(CONFIG_IA32_EMULATION) += sys_ia32.o +obj-$(CONFIG_X86_32) += sys_ia32.o signal_32.o +obj-$(CONFIG_IA32_EMULATION) += sys_ia32.o signal_32.o obj-$(CONFIG_X86_64) += sys_x86_64.o obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o obj-$(CONFIG_SYSFS) += ksysfs.o
arch/x86/kernel/signal.c +6 -213
315 lines not on this page · raw message
arch/x86/kernel/signal_32.c new file +379 -0
379 lines not on this page · raw message
include/linux/syscalls.h +2 -0
@@ -264,6 +264,7 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event)#define SC_VAL64 (type, name) ((type) name##_hi << 32 | name##_lo)#ifdef CONFIG_COMPAT +#define SYSCALL32_DEFINE0 COMPAT_SYSCALL_DEFINE0#define SYSCALL32_DEFINE1 COMPAT_SYSCALL_DEFINE1#define SYSCALL32_DEFINE2 COMPAT_SYSCALL_DEFINE2#define SYSCALL32_DEFINE3 COMPAT_SYSCALL_DEFINE3
@@ -271,6 +272,7 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event)#define SYSCALL32_DEFINE5 COMPAT_SYSCALL_DEFINE5#define SYSCALL32_DEFINE6 COMPAT_SYSCALL_DEFINE6#else +#define SYSCALL32_DEFINE0 SYSCALL_DEFINE0#define SYSCALL32_DEFINE1 SYSCALL_DEFINE1#define SYSCALL32_DEFINE2 SYSCALL_DEFINE2#define SYSCALL32_DEFINE3 SYSCALL_DEFINE3
PATCH 8/8 x86/signal/64: Move 64-bit signal code to its own file
In reply to Brian Gerst--- arch/x86/kernel/Makefile | 4 +- arch/x86/kernel/signal.c | 376 ----------------------------------- arch/x86/kernel/signal_64.c | 383 ++++++++++++++++++++++++++++++++++++ 3 files changed, 385 insertions(+), 378 deletions(-) create mode 100644 arch/x86/kernel/signal_64.c
arch/x86/kernel/Makefile +2 -2
@@ -48,7 +48,7 @@ KCOV_INSTRUMENT := n CFLAGS_irq.o := -I $(srctree)/$(src)/../include/asm/trace -obj-y := process_$(BITS).o signal.o +obj-y := process_$(BITS).o signal.o signal_$(BITS).o obj-$(CONFIG_COMPAT) += signal_compat.o obj-y += traps.o idt.o irq.o irq_$(BITS).o dumpstack_$(BITS).o obj-y += time.o ioport.o dumpstack.o nmi.o
@@ -57,7 +57,7 @@ obj-y += setup.o x86_init.o i8259.o irqinit.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o -obj-$(CONFIG_X86_32) += sys_ia32.o signal_32.o +obj-$(CONFIG_X86_32) += sys_ia32.o obj-$(CONFIG_IA32_EMULATION) += sys_ia32.o signal_32.o obj-$(CONFIG_X86_64) += sys_x86_64.o obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o
arch/x86/kernel/signal.c +0 -376
397 lines not on this page · raw message
arch/x86/kernel/signal_64.c new file +383 -0
383 lines not on this page · raw message
Signature · 1 line
2.35.3
[tip: x86/misc] x86/signal/64: Move 64-bit signal code to its own file
The following commit has been merged into the x86/misc branch of tip:
The following commit has been merged into the x86/misc branch of tip:
Commit-ID: a545b48c2d907d6096e7bcf65d9b0681cc850e69 Gitweb: https://git.kernel.org/tip/a545b48c2d907d6096e7bcf65d9b0681cc850e69 Author: Brian Gerst <[email protected]> AuthorDate: Mon, 06 Jun 2022 16:38:02 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Wed, 19 Oct 2022 09:58:49 +02:00
x86/signal/64: Move 64-bit signal code to its own file
[ bp: Fixup merge conflict caused by changes coming from the kbuild tree. ]
--- arch/x86/kernel/Makefile | 4 +- arch/x86/kernel/signal.c | 376 +---------------------------------- arch/x86/kernel/signal_64.c | 383 +++++++++++++++++++++++++++++++++++- 3 files changed, 385 insertions(+), 378 deletions(-) create mode 100644 arch/x86/kernel/signal_64.c
arch/x86/kernel/Makefile +2 -2
@@ -44,7 +44,7 @@ obj-y += head_$(BITS).o obj-y += head$(BITS).o obj-y += ebda.o obj-y += platform-quirks.o -obj-y += process_$(BITS).o signal.o +obj-y += process_$(BITS).o signal.o signal_$(BITS).o obj-$(CONFIG_COMPAT) += signal_compat.o obj-y += traps.o idt.o irq.o irq_$(BITS).o dumpstack_$(BITS).o obj-y += time.o ioport.o dumpstack.o nmi.o
@@ -53,7 +53,7 @@ obj-y += setup.o x86_init.o i8259.o irqinit.o obj-$(CONFIG_JUMP_LABEL) += jump_label.o obj-$(CONFIG_IRQ_WORK) += irq_work.o obj-y += probe_roms.o -obj-$(CONFIG_X86_32) += sys_ia32.o signal_32.o +obj-$(CONFIG_X86_32) += sys_ia32.o obj-$(CONFIG_IA32_EMULATION) += sys_ia32.o signal_32.o obj-$(CONFIG_X86_64) += sys_x86_64.o obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o
arch/x86/kernel/signal.c +0 -376
397 lines not on this page · raw message
arch/x86/kernel/signal_64.c new file +383 -0
383 lines not on this page · raw message
Quoted 4 lines · Brian Gerst
The 32-bit signal code has significant differences from 64-bit, and those are duplicated for native and compat modes. This patch series merges the 32-bit code into one file, and does some general cleanups in the x86 signal code. There should be no functional changes.
At a quick skim I don't see anything scary in there.
Quoted 19 lines
Brian Gerst (8):
x86/signal: Remove sig parameter from frame setup functions x86/signal: Removesigset_tparameter from frame setup functions signal/compat: Removecompat_sigset_toverride
x86: Remove__USER32_DS
x86/signal: Mergeget_sigframe()
x86/signal: Add ABI prefixes to frame setup functions x86/signal/32: Merge native and compat 32-bit signal code x86/signal/64: Move 64-bit signal code to its own filearch/x86/entry/entry_64_compat.S | 4 +- arch/x86/ia32/Makefile | 2 - arch/x86/include/asm/elf.h | 4 - arch/x86/include/asm/fpu/signal.h | 7 - arch/x86/include/asm/segment.h | 2 +- arch/x86/include/asm/sighandling.h | 9 + arch/x86/include/asm/signal.h | 5 - arch/x86/kernel/Makefile | 4 +- arch/x86/kernel/signal.c | 654 +-----------------
Quoted 8 lines
.../ia32_signal.c => kernel/signal_32.c} | 117 ++--
arch/x86/kernel/signal_64.c | 383 ++++++++++
arch/x86/xen/xen-asm.S | 8 +-
include/linux/compat.h | 2 -
include/linux/syscalls.h | 2 +
14 files changed, 493 insertions(+), 710 deletions(-)
rename arch/x86/{ia32/ia32_signal.c => kernel/signal_32.c} (82%)
create mode 100644 arch/x86/kernel/signal_64.cEric
Andy Lutomirski
maintainerQuoted 5 lines · Brian Gerst
The 32-bit signal code has significant differences from 64-bit, and those are duplicated for native and compat modes. This patch series merges the 32-bit code into one file, and does some general cleanups in the x86 signal code. There should be no functional changes.
This looks generally sane. What kind of testing have you done?
--Andy
Quoted 9 lines · Andy Lutomirski
Quoted 5 lines · Brian Gerst
The 32-bit signal code has significant differences from 64-bit, and those are duplicated for native and compat modes. This patch series merges the 32-bit code into one file, and does some general cleanups in the x86 signal code. There should be no functional changes.
This looks generally sane. What kind of testing have you done?
I ran all of the self tests, did a parallel kernel build, and general usage like web browsing. Do you have any suggestions for other tests?
--
Brian Gerst