x86_64: signal: clean up signal_fault()
PATCH 1/3 x86_64: signal: clean up signal_fault()
From: Hiroshi Shimamoto <[email protected]>
clean up and make signal_fault() same as 32bit.
Signed-off-by Hiroshi Shimamoto <[email protected]>
--- arch/x86/kernel/signal_64.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
arch/x86/kernel/signal_64.c +6 -4
@@ -473,12 +473,14 @@ void do_notify_resume(struct pt_regs *regs, void *unused,void signal_fault (struct pt_regs *regs,void __user *frame,char *where) {struct task_struct *me = current; +if (show_unhandled_signals &&printk_ratelimit ()) { -printk ("%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx" , - me->comm, me->pid, where, frame, regs->ip, - regs->sp, regs->orig_ax); +printk (KERN_INFO +"%s[%d] bad frame in %s frame:%p ip:%lx sp:%lx orax:%lx" , + me->comm, me->pid, where, frame, + regs->ip, regs->sp, regs->orig_ax);print_vma_addr (" in " , regs->ip); -printk ("\n" ); +printk (KERN_CONT "\n" ); }force_sig (SIGSEGV , me);
Signature · 1 line
1.5.6
PATCH 2/3 x86_64: signal: arg for restore_i387_xstate() is void __user *
From: Hiroshi Shimamoto <[email protected]>
restore_i387_xstate() is declared;
int restore_i387_xstate(void __user *buf);
so, make the variable buf void __user *.
Signed-off-by Hiroshi Shimamoto <[email protected]>
--- arch/x86/kernel/signal_64.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/x86/kernel/signal_64.c +2 -1
@@ -94,7 +94,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, } { -struct _fpstate __user *buf; +void __user *buf; + err |=__get_user (buf, &sc->fpstate); err |=restore_i387_xstate (buf); }
Signature · 1 line
1.5.6
PATCH 3/3 x86_64: signal: make handle_signal() similar
In reply to Hiroshi ShimamotoFrom: Hiroshi Shimamoto <[email protected]>
Make handle_signal() same as 32bit.
Signed-off-by Hiroshi Shimamoto <[email protected]>
--- arch/x86/kernel/signal_64.c | 61 ++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 30 deletions(-)
arch/x86/kernel/signal_64.c +29 -28
@@ -338,39 +338,40 @@ handle_signal(unsigned long sig, siginfo_t *info, struct k_sigaction *ka, ret =setup_rt_frame (sig, ka, info, oldset, regs); -if (ret ==0 ) { -/* -* This has nothing to do with segment registers, -* despite the name. This magic affects uaccess.h -* macros' behavior. Reset it to the normal setting. -*/ -set_fs (USER_DS ); +if (ret) +return ret; -/* -* Clear the direction flag as per the ABI for function entry. -*/ - regs->flags &= ~X86_EFLAGS_DF ; +/* +* This has nothing to do with segment registers, +* despite the name. This magic affects uaccess.h +* macros' behavior. Reset it to the normal setting. +*/ +set_fs (USER_DS ); -/* -* Clear TF when entering the signal handler, but -* notify any tracer that was single-stepping it. -* The tracer may want to single-step inside the -* handler too. -*/ - regs->flags &= ~X86_EFLAGS_TF ; +/* +* Clear the direction flag as per the ABI for function entry. +*/ + regs->flags &= ~X86_EFLAGS_DF ; -spin_lock_irq (¤t->sighand->siglock); -sigorsets (¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); -if (!(ka->sa.sa_flags &SA_NODEFER )) -sigaddset (¤t->blocked, sig); -recalc_sigpending (); -spin_unlock_irq (¤t->sighand->siglock); +/* +* Clear TF when entering the signal handler, but +* notify any tracer that was single-stepping it. +* The tracer may want to single-step inside the +* handler too. +*/ + regs->flags &= ~X86_EFLAGS_TF ; -tracehook_signal_handler (sig, info, ka, regs, -test_thread_flag (TIF_SINGLESTEP )); - } +spin_lock_irq (¤t->sighand->siglock); +sigorsets (¤t->blocked, ¤t->blocked, &ka->sa.sa_mask); +if (!(ka->sa.sa_flags &SA_NODEFER )) +sigaddset (¤t->blocked, sig); +recalc_sigpending (); +spin_unlock_irq (¤t->sighand->siglock); -return ret; +tracehook_signal_handler (sig, info, ka, regs, +test_thread_flag (TIF_SINGLESTEP )); + +return 0 ; }#define NR_restart_syscall \
Signature · 1 line
1.5.6
Ingo Molnar
Appliedapplied these patches to x86/signal:
764e8d1: x86: signal_64.c: make handle_signal() similar 0c40ed7: x86: signal_64.c: arg for restore_i387_xstate() is void __user *
b2994ef: x86: signal_64.c: clean up signal_fault()
thanks!
Ingo