956d3333ca
----------------------------- The compatibility code and/or emulators have been updated: iBCS2 now mostly uses the older syscalls. SVR4 now properly handles all signals. This has been achieved by using the new sigset_t throughout the emulator. The Linuxulator has been severely updated. Internally the new Linux sigset_t is made the default. These are then mapped to and from the new FreeBSD sigset_t. Also, rt_sigsuspend has been implemented in the Linuxulator. Implementing this syscall basicly caused all this sigset_t changing in the first place and the syscall has been used throughout the change as a means for testing. It basicly is too much work to undo the implementation so that it can later be added again. A special note on the use of sv_sigtbl and sv_sigsize in struct sysentvec: Every signal larger than sv_sigsize is not translated and is passed on to the signal handler unmodified. Signals in the range 1 upto and including sv_sigsize are translated. The rationale is that only the system defined signals need to be translated. The emulators also have been updated so that the translation tables are only indexed for valid (system defined) signals. This change also fixes the translation bug already in the SVR4 emulator.
485 lines
12 KiB
C
485 lines
12 KiB
C
/*
|
|
* Copyright (c) 1995 Scott Bartram
|
|
* Copyright (c) 1995 Steven Wallace
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/systm.h>
|
|
#include <sys/signalvar.h>
|
|
#include <sys/sysproto.h>
|
|
|
|
#include <i386/ibcs2/ibcs2_types.h>
|
|
#include <i386/ibcs2/ibcs2_signal.h>
|
|
#include <i386/ibcs2/ibcs2_proto.h>
|
|
#include <i386/ibcs2/ibcs2_xenix.h>
|
|
#include <i386/ibcs2/ibcs2_util.h>
|
|
|
|
#define sigemptyset(s) SIGEMPTYSET(*(s))
|
|
#define sigismember(s, n) SIGISMEMBER(*(s), n)
|
|
#define sigaddset(s, n) SIGADDSET(*(s), n)
|
|
|
|
#define ibcs2_sigmask(n) (1 << ((n) - 1))
|
|
#define ibcs2_sigemptyset(s) bzero((s), sizeof(*(s)))
|
|
#define ibcs2_sigismember(s, n) (*(s) & ibcs2_sigmask(n))
|
|
#define ibcs2_sigaddset(s, n) (*(s) |= ibcs2_sigmask(n))
|
|
|
|
static void ibcs2_to_bsd_sigset __P((const ibcs2_sigset_t *, sigset_t *));
|
|
static void bsd_to_ibcs2_sigset __P((const sigset_t *, ibcs2_sigset_t *));
|
|
static void ibcs2_to_bsd_sigaction __P((struct ibcs2_sigaction *,
|
|
struct sigaction *));
|
|
static void bsd_to_ibcs2_sigaction __P((struct sigaction *,
|
|
struct ibcs2_sigaction *));
|
|
|
|
int bsd_to_ibcs2_sig[IBCS2_SIGTBLSZ] = {
|
|
IBCS2_SIGHUP, /* 1 */
|
|
IBCS2_SIGINT, /* 2 */
|
|
IBCS2_SIGQUIT, /* 3 */
|
|
IBCS2_SIGILL, /* 4 */
|
|
IBCS2_SIGTRAP, /* 5 */
|
|
IBCS2_SIGABRT, /* 6 */
|
|
IBCS2_SIGEMT, /* 7 */
|
|
IBCS2_SIGFPE, /* 8 */
|
|
IBCS2_SIGKILL, /* 9 */
|
|
IBCS2_SIGBUS, /* 10 */
|
|
IBCS2_SIGSEGV, /* 11 */
|
|
IBCS2_SIGSYS, /* 12 */
|
|
IBCS2_SIGPIPE, /* 13 */
|
|
IBCS2_SIGALRM, /* 14 */
|
|
IBCS2_SIGTERM, /* 15 */
|
|
0, /* 16 - SIGURG */
|
|
IBCS2_SIGSTOP, /* 17 */
|
|
IBCS2_SIGTSTP, /* 18 */
|
|
IBCS2_SIGCONT, /* 19 */
|
|
IBCS2_SIGCLD, /* 20 */
|
|
IBCS2_SIGTTIN, /* 21 */
|
|
IBCS2_SIGTTOU, /* 22 */
|
|
IBCS2_SIGPOLL, /* 23 */
|
|
0, /* 24 - SIGXCPU */
|
|
0, /* 25 - SIGXFSZ */
|
|
IBCS2_SIGVTALRM, /* 26 */
|
|
IBCS2_SIGPROF, /* 27 */
|
|
IBCS2_SIGWINCH, /* 28 */
|
|
0, /* 29 */
|
|
IBCS2_SIGUSR1, /* 30 */
|
|
IBCS2_SIGUSR2, /* 31 */
|
|
0 /* 32 */
|
|
};
|
|
|
|
static int ibcs2_to_bsd_sig[IBCS2_SIGTBLSZ] = {
|
|
SIGHUP, /* 1 */
|
|
SIGINT, /* 2 */
|
|
SIGQUIT, /* 3 */
|
|
SIGILL, /* 4 */
|
|
SIGTRAP, /* 5 */
|
|
SIGABRT, /* 6 */
|
|
SIGEMT, /* 7 */
|
|
SIGFPE, /* 8 */
|
|
SIGKILL, /* 9 */
|
|
SIGBUS, /* 10 */
|
|
SIGSEGV, /* 11 */
|
|
SIGSYS, /* 12 */
|
|
SIGPIPE, /* 13 */
|
|
SIGALRM, /* 14 */
|
|
SIGTERM, /* 15 */
|
|
SIGUSR1, /* 16 */
|
|
SIGUSR2, /* 17 */
|
|
SIGCHLD, /* 18 */
|
|
0, /* 19 - SIGPWR */
|
|
SIGWINCH, /* 20 */
|
|
0, /* 21 */
|
|
SIGIO, /* 22 */
|
|
SIGSTOP, /* 23 */
|
|
SIGTSTP, /* 24 */
|
|
SIGCONT, /* 25 */
|
|
SIGTTIN, /* 26 */
|
|
SIGTTOU, /* 27 */
|
|
SIGVTALRM, /* 28 */
|
|
SIGPROF, /* 29 */
|
|
0, /* 30 */
|
|
0, /* 31 */
|
|
0 /* 32 */
|
|
};
|
|
|
|
void
|
|
ibcs2_to_bsd_sigset(iss, bss)
|
|
const ibcs2_sigset_t *iss;
|
|
sigset_t *bss;
|
|
{
|
|
int i, newsig;
|
|
|
|
sigemptyset(bss);
|
|
for (i = 1; i <= IBCS2_SIGTBLSZ; i++) {
|
|
if (ibcs2_sigismember(iss, i)) {
|
|
newsig = ibcs2_to_bsd_sig[_SIG_IDX(i)];
|
|
if (newsig)
|
|
sigaddset(bss, newsig);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
bsd_to_ibcs2_sigset(bss, iss)
|
|
const sigset_t *bss;
|
|
ibcs2_sigset_t *iss;
|
|
{
|
|
int i, newsig;
|
|
|
|
ibcs2_sigemptyset(iss);
|
|
for (i = 1; i <= IBCS2_SIGTBLSZ; i++) {
|
|
if (sigismember(bss, i)) {
|
|
newsig = bsd_to_ibcs2_sig[_SIG_IDX(i)];
|
|
if (newsig)
|
|
ibcs2_sigaddset(iss, newsig);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
ibcs2_to_bsd_sigaction(isa, bsa)
|
|
struct ibcs2_sigaction *isa;
|
|
struct sigaction *bsa;
|
|
{
|
|
|
|
bsa->sa_handler = isa->isa_handler;
|
|
ibcs2_to_bsd_sigset(&isa->isa_mask, &bsa->sa_mask);
|
|
bsa->sa_flags = 0; /* ??? SA_NODEFER */
|
|
if ((isa->isa_flags & IBCS2_SA_NOCLDSTOP) != 0)
|
|
bsa->sa_flags |= SA_NOCLDSTOP;
|
|
}
|
|
|
|
static void
|
|
bsd_to_ibcs2_sigaction(bsa, isa)
|
|
struct sigaction *bsa;
|
|
struct ibcs2_sigaction *isa;
|
|
{
|
|
|
|
isa->isa_handler = bsa->sa_handler;
|
|
bsd_to_ibcs2_sigset(&bsa->sa_mask, &isa->isa_mask);
|
|
isa->isa_flags = 0;
|
|
if ((bsa->sa_flags & SA_NOCLDSTOP) != 0)
|
|
isa->isa_flags |= IBCS2_SA_NOCLDSTOP;
|
|
}
|
|
|
|
int
|
|
ibcs2_sigaction(p, uap)
|
|
register struct proc *p;
|
|
struct ibcs2_sigaction_args *uap;
|
|
{
|
|
struct ibcs2_sigaction *nisa, *oisa, tmpisa;
|
|
struct sigaction *nbsa, *obsa, tmpbsa;
|
|
struct sigaction_args sa;
|
|
caddr_t sg;
|
|
int error;
|
|
|
|
sg = stackgap_init();
|
|
nisa = SCARG(uap, act);
|
|
oisa = SCARG(uap, oact);
|
|
|
|
if (oisa != NULL)
|
|
obsa = stackgap_alloc(&sg, sizeof(struct sigaction));
|
|
else
|
|
obsa = NULL;
|
|
|
|
if (nisa != NULL) {
|
|
nbsa = stackgap_alloc(&sg, sizeof(struct sigaction));
|
|
if ((error = copyin(nisa, &tmpisa, sizeof(tmpisa))) != 0)
|
|
return error;
|
|
ibcs2_to_bsd_sigaction(&tmpisa, &tmpbsa);
|
|
if ((error = copyout(&tmpbsa, nbsa, sizeof(tmpbsa))) != 0)
|
|
return error;
|
|
} else
|
|
nbsa = NULL;
|
|
|
|
SCARG(&sa, sig) = ibcs2_to_bsd_sig[_SIG_IDX(SCARG(uap, sig))];
|
|
SCARG(&sa, act) = nbsa;
|
|
SCARG(&sa, oact) = obsa;
|
|
|
|
if ((error = sigaction(p, &sa)) != 0)
|
|
return error;
|
|
|
|
if (oisa != NULL) {
|
|
if ((error = copyin(obsa, &tmpbsa, sizeof(tmpbsa))) != 0)
|
|
return error;
|
|
bsd_to_ibcs2_sigaction(&tmpbsa, &tmpisa);
|
|
if ((error = copyout(&tmpisa, oisa, sizeof(tmpisa))) != 0)
|
|
return error;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int
|
|
ibcs2_sigsys(p, uap)
|
|
register struct proc *p;
|
|
struct ibcs2_sigsys_args *uap;
|
|
{
|
|
struct sigaction sa;
|
|
int signum = ibcs2_to_bsd_sig[_SIG_IDX(IBCS2_SIGNO(SCARG(uap, sig)))];
|
|
int error;
|
|
caddr_t sg = stackgap_init();
|
|
|
|
if (signum <= 0 || signum >= IBCS2_NSIG) {
|
|
if (IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGNAL_MASK ||
|
|
IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGSET_MASK)
|
|
p->p_retval[0] = (int)IBCS2_SIG_ERR;
|
|
return EINVAL;
|
|
}
|
|
|
|
switch (IBCS2_SIGCALL(SCARG(uap, sig))) {
|
|
case IBCS2_SIGSET_MASK:
|
|
/*
|
|
* Check for SIG_HOLD action.
|
|
* Otherwise, perform signal() except with different sa_flags.
|
|
*/
|
|
if (SCARG(uap, fp) != IBCS2_SIG_HOLD) {
|
|
/* add sig to mask before exececuting signal handler */
|
|
sa.sa_flags = 0;
|
|
goto ibcs2_sigset;
|
|
}
|
|
/* else fallthrough to sighold */
|
|
|
|
case IBCS2_SIGHOLD_MASK:
|
|
{
|
|
struct osigprocmask_args sa;
|
|
|
|
SCARG(&sa, how) = SIG_BLOCK;
|
|
SCARG(&sa, mask) = sigmask(signum);
|
|
return osigprocmask(p, &sa);
|
|
}
|
|
|
|
case IBCS2_SIGNAL_MASK:
|
|
{
|
|
struct sigaction_args sa_args;
|
|
struct sigaction *nbsa, *obsa;
|
|
|
|
/* do not automatically block signal */
|
|
sa.sa_flags = SA_NODEFER;
|
|
#ifdef SA_RESETHAND
|
|
if((signum != IBCS2_SIGILL) &&
|
|
(signum != IBCS2_SIGTRAP) &&
|
|
(signum != IBCS2_SIGPWR))
|
|
/* set to SIG_DFL before executing handler */
|
|
sa.sa_flags |= SA_RESETHAND;
|
|
#endif
|
|
ibcs2_sigset:
|
|
nbsa = stackgap_alloc(&sg, sizeof(struct sigaction));
|
|
obsa = stackgap_alloc(&sg, sizeof(struct sigaction));
|
|
SCARG(&sa_args, sig) = signum;
|
|
SCARG(&sa_args, act) = nbsa;
|
|
SCARG(&sa_args, oact) = obsa;
|
|
|
|
sa.sa_handler = SCARG(uap, fp);
|
|
sigemptyset(&sa.sa_mask);
|
|
#if 0
|
|
if (signum != SIGALRM)
|
|
sa.sa_flags |= SA_RESTART;
|
|
#endif
|
|
p->p_retval[0] = (int)IBCS2_SIG_ERR; /* init error return */
|
|
|
|
/* perform native sigaction() */
|
|
if ((error = copyout(&sa, nbsa, sizeof(sa))) != 0)
|
|
return error;
|
|
if ((error = sigaction(p, &sa_args)) != 0) {
|
|
DPRINTF(("signal: sigaction failed: %d\n",
|
|
error));
|
|
return error;
|
|
}
|
|
if ((error = copyin(obsa, &sa, sizeof(sa))) != 0)
|
|
return error;
|
|
p->p_retval[0] = (int)sa.sa_handler;
|
|
|
|
/* special sigset() check */
|
|
if(IBCS2_SIGCALL(SCARG(uap, sig)) == IBCS2_SIGSET_MASK)
|
|
/* check to make sure signal is not blocked */
|
|
if(sigismember(&p->p_sigmask, signum)) {
|
|
/* return SIG_HOLD and unblock signal*/
|
|
p->p_retval[0] = (int)IBCS2_SIG_HOLD;
|
|
SIGDELSET(p->p_sigmask, signum);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
case IBCS2_SIGRELSE_MASK:
|
|
{
|
|
struct osigprocmask_args sa;
|
|
|
|
SCARG(&sa, how) = SIG_UNBLOCK;
|
|
SCARG(&sa, mask) = sigmask(signum);
|
|
return osigprocmask(p, &sa);
|
|
}
|
|
|
|
case IBCS2_SIGIGNORE_MASK:
|
|
{
|
|
struct sigaction_args sa_args;
|
|
struct sigaction *bsa;
|
|
|
|
bsa = stackgap_alloc(&sg, sizeof(struct sigaction));
|
|
SCARG(&sa_args, sig) = signum;
|
|
SCARG(&sa_args, act) = bsa;
|
|
SCARG(&sa_args, oact) = NULL;
|
|
|
|
sa.sa_handler = SIG_IGN;
|
|
sigemptyset(&sa.sa_mask);
|
|
sa.sa_flags = 0;
|
|
if ((error = copyout(&sa, bsa, sizeof(sa))) != 0)
|
|
return error;
|
|
if ((error = sigaction(p, &sa_args)) != 0) {
|
|
DPRINTF(("sigignore: sigaction failed\n"));
|
|
return error;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
case IBCS2_SIGPAUSE_MASK:
|
|
{
|
|
osigset_t mask;
|
|
struct osigsuspend_args sa;
|
|
|
|
SIG2OSIG(p->p_sigmask, mask);
|
|
SCARG(&sa, mask) = mask &~ sigmask(signum);
|
|
return osigsuspend(p, &sa);
|
|
}
|
|
|
|
default:
|
|
return ENOSYS;
|
|
}
|
|
}
|
|
|
|
int
|
|
ibcs2_sigprocmask(p, uap)
|
|
register struct proc *p;
|
|
struct ibcs2_sigprocmask_args *uap;
|
|
{
|
|
ibcs2_sigset_t iss;
|
|
sigset_t bss;
|
|
int error = 0;
|
|
|
|
if (SCARG(uap, oset) != NULL) {
|
|
/* Fix the return value first if needed */
|
|
bsd_to_ibcs2_sigset(&p->p_sigmask, &iss);
|
|
if ((error = copyout(&iss, SCARG(uap, oset), sizeof(iss))) != 0)
|
|
return error;
|
|
}
|
|
|
|
if (SCARG(uap, set) == NULL)
|
|
/* Just examine */
|
|
return 0;
|
|
|
|
if ((error = copyin(SCARG(uap, set), &iss, sizeof(iss))) != 0)
|
|
return error;
|
|
|
|
ibcs2_to_bsd_sigset(&iss, &bss);
|
|
|
|
(void) splhigh();
|
|
|
|
switch (SCARG(uap, how)) {
|
|
case IBCS2_SIG_BLOCK:
|
|
SIGSETOR(p->p_sigmask, bss);
|
|
SIG_CANTMASK(p->p_sigmask);
|
|
break;
|
|
|
|
case IBCS2_SIG_UNBLOCK:
|
|
SIGSETNAND(p->p_sigmask, bss);
|
|
break;
|
|
|
|
case IBCS2_SIG_SETMASK:
|
|
p->p_sigmask = bss;
|
|
SIG_CANTMASK(p->p_sigmask);
|
|
break;
|
|
|
|
default:
|
|
error = EINVAL;
|
|
break;
|
|
}
|
|
|
|
(void) spl0();
|
|
|
|
return error;
|
|
}
|
|
|
|
int
|
|
ibcs2_sigpending(p, uap)
|
|
register struct proc *p;
|
|
struct ibcs2_sigpending_args *uap;
|
|
{
|
|
sigset_t bss;
|
|
ibcs2_sigset_t iss;
|
|
|
|
bss = p->p_siglist;
|
|
SIGSETAND(bss, p->p_sigmask);
|
|
bsd_to_ibcs2_sigset(&bss, &iss);
|
|
|
|
return copyout(&iss, SCARG(uap, mask), sizeof(iss));
|
|
}
|
|
|
|
int
|
|
ibcs2_sigsuspend(p, uap)
|
|
register struct proc *p;
|
|
struct ibcs2_sigsuspend_args *uap;
|
|
{
|
|
ibcs2_sigset_t sss;
|
|
sigset_t bss;
|
|
osigset_t mask;
|
|
struct osigsuspend_args sa;
|
|
int error;
|
|
|
|
if ((error = copyin(SCARG(uap, mask), &sss, sizeof(sss))) != 0)
|
|
return error;
|
|
|
|
ibcs2_to_bsd_sigset(&sss, &bss);
|
|
SIG2OSIG(bss, mask);
|
|
SCARG(&sa, mask) = mask;
|
|
return osigsuspend(p, &sa);
|
|
}
|
|
|
|
int
|
|
ibcs2_pause(p, uap)
|
|
register struct proc *p;
|
|
struct ibcs2_pause_args *uap;
|
|
{
|
|
struct osigsuspend_args bsa;
|
|
osigset_t mask;
|
|
|
|
SIG2OSIG(p->p_sigmask, mask);
|
|
SCARG(&bsa, mask) = mask;
|
|
return osigsuspend(p, &bsa);
|
|
}
|
|
|
|
int
|
|
ibcs2_kill(p, uap)
|
|
register struct proc *p;
|
|
struct ibcs2_kill_args *uap;
|
|
{
|
|
struct kill_args ka;
|
|
|
|
SCARG(&ka, pid) = SCARG(uap, pid);
|
|
SCARG(&ka, signum) = ibcs2_to_bsd_sig[_SIG_IDX(SCARG(uap, signo))];
|
|
return kill(p, &ka);
|
|
}
|