Module Name: src
Committed By: matt
Date: Mon Feb 7 09:39:49 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: sig_machdep.c
Log Message:
PR port-macppc/43619
Save handler before calling sendsig_reset before it will reset to SIG_DFL
is SA_RESETHAND is set.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/powerpc/powerpc/sig_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/sig_machdep.c
diff -u src/sys/arch/powerpc/powerpc/sig_machdep.c:1.38 src/sys/arch/powerpc/powerpc/sig_machdep.c:1.39
--- src/sys/arch/powerpc/powerpc/sig_machdep.c:1.38 Tue Jan 18 01:02:55 2011
+++ src/sys/arch/powerpc/powerpc/sig_machdep.c Mon Feb 7 09:39:48 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.38 2011/01/18 01:02:55 matt Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.39 2011/02/07 09:39:48 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.38 2011/01/18 01:02:55 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.39 2011/02/07 09:39:48 matt Exp $");
#include "opt_ppcarch.h"
#include "opt_altivec.h"
@@ -58,10 +58,12 @@
{
struct lwp * const l = curlwp;
struct proc * const p = l->l_proc;
- struct trapframe * const tf = trapframe(l);
- struct sigaltstack *ss = &l->l_sigstk;
- const struct sigact_sigdesc *sd =
+ struct trapframe * const tf = l->l_md.md_utf;
+ struct sigaltstack * const ss = &l->l_sigstk;
+ const struct sigact_sigdesc * const sd =
&p->p_sigacts->sa_sigdesc[ksi->ksi_signo];
+ /* save handler before sendsig_reset trashes it! */
+ const void * const handler = sd->sd_sigact.sa_handler;
ucontext_t uc;
vaddr_t sp, sip, ucp;
int onstack, error;
@@ -122,7 +124,7 @@
/* Preserve ucp across call to signal function */
tf->tf_fixreg[30] = (register_t)ucp;
tf->tf_lr = (register_t)sd->sd_tramp;
- tf->tf_srr0 = (register_t)sd->sd_sigact.sa_handler;
+ tf->tf_srr0 = (register_t)handler;
break;
default:
