Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a machine-dependent SIGTRAMP_VALID macro which is used to test whether 

a trampoline version is valid or not.
This commit is contained in:
matt 2003-09-26 22:14:19 +00:00
parent 81d5d9d0f3
commit 6986092cfe
2 changed files with 13 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
sys/arch/powerpc/include/signal.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: signal.h,v 1.14 2003/09/25 22:22:36 matt Exp $ */
/* $NetBSD: signal.h,v 1.15 2003/09/26 22:14:19 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -61,47 +61,17 @@ struct sigcontext {
sigset_t sc_mask; /* saved signal mask (new style) */
};
#ifndef __HAVE_SIGINFO
/*
* The following macros are used to convert from a ucontext to sigcontext,
* and vice-versa. This is for building a sigcontext to deliver to old-style
* signal handlers, and converting back (in the event the handler modifies
* the context).
*/
#define _MCONTEXT_TO_SIGCONTEXT(uc, sc) \
do { \
memcpy((sc)->sc_frame.fixreg, &(uc)->uc_mcontext.__gregs[_REG_R0], \
sizeof((sc)->sc_frame.fixreg)); \
(sc)->sc_frame.cr = (uc)->uc_mcontext.__gregs[_REG_CR]; \
(sc)->sc_frame.lr = (uc)->uc_mcontext.__gregs[_REG_LR]; \
(sc)->sc_frame.srr0 = (uc)->uc_mcontext.__gregs[_REG_PC]; \
(sc)->sc_frame.srr1 = (uc)->uc_mcontext.__gregs[_REG_MSR]; \
(sc)->sc_frame.ctr = (uc)->uc_mcontext.__gregs[_REG_CTR]; \
(sc)->sc_frame.xer = (uc)->uc_mcontext.__gregs[_REG_XER]; \
(sc)->sc_frame.mq = (uc)->uc_mcontext.__gregs[_REG_MQ]; \
(sc)->sc_frame.vrsave = (uc)->uc_mcontext.__vrf.__vrsave; \
(sc)->sc_frame.spare = 0; \
} while (/*CONSTCOND*/0)
#define _SIGCONTEXT_TO_MCONTEXT(sc, uc) \
do { \
memcpy(&(uc)->uc_mcontext.__gregs[_REG_R0], (sc)->sc_frame.fixreg, \
sizeof((sc)->sc_frame.fixreg)); \
(uc)->uc_mcontext.__gregs[_REG_CR] = (sc)->sc_frame.cr; \
(uc)->uc_mcontext.__gregs[_REG_LR] = (sc)->sc_frame.lr; \
(uc)->uc_mcontext.__gregs[_REG_PC] = (sc)->sc_frame.srr0; \
(uc)->uc_mcontext.__gregs[_REG_MSR] = (sc)->sc_frame.srr1; \
(uc)->uc_mcontext.__gregs[_REG_CTR] = (sc)->sc_frame.ctr; \
(uc)->uc_mcontext.__gregs[_REG_XER] = (sc)->sc_frame.xer; \
(uc)->uc_mcontext.__gregs[_REG_MQ] = (sc)->sc_frame.mq; \
(uc)->uc_mcontext.__vrf.__vrsave = (sc)->sc_frame.vrsave; \
} while (/*CONSTCOND*/0)
#endif /* !__HAVE_SIGINFO */
#ifdef _KERNEL
void sendsig_sigcontext(int, const sigset_t *, u_long);
#ifdef COMPAT_16
#define SIGTRAMP_VALID(vers) ((vers) <= 2)
#else
#define SIGTRAMP_VALID(vers) ((vers) == 0 && (vers) == 2)
#endif
#endif /* _KERNEL */
#endif /* _NETBSD_SOURCE */
#endif /* !_LOCORE */
#endif /* !_POWERPC_SIGNAL_H_ */

7
sys/kern/kern_sig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_sig.c,v 1.160 2003/09/25 21:59:18 christos Exp $ */
/* $NetBSD: kern_sig.c,v 1.161 2003/09/26 22:14:19 matt Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1991, 1993
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.160 2003/09/25 21:59:18 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.161 2003/09/26 22:14:19 matt Exp $");
#include "opt_ktrace.h"
#include "opt_compat_sunos.h"
@ -278,6 +278,9 @@ sigaction1(struct proc *p, int signum, const struct sigaction *nsa,
* trampoline.
*/
if ((vers != 0 && tramp == NULL) ||
#ifdef SIGTRAMP_VALID
!SIGTRAMP_VALID(vers) ||
#endif
(vers == 0 && tramp != NULL))
return (EINVAL);