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

No need for stackgap for darwin_sys_sigaction and sigprocmask. 

XXX: it doesn't look right that the new and old 'sigaction' parameters
have different types.
This commit is contained in:
dsl 2007-06-17 20:15:19 +00:00
parent 6111df536a
commit 95206f19b1
1 changed files with 22 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

91
sys/compat/darwin/darwin_signal.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: darwin_signal.c,v 1.25 2007/05/21 15:35:47 christos Exp $ */
/* $NetBSD: darwin_signal.c,v 1.26 2007/06/17 20:15:19 dsl Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.25 2007/05/21 15:35:47 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: darwin_signal.c,v 1.26 2007/06/17 20:15:19 dsl Exp $");
#include <sys/types.h>
#include <sys/param.h>
@ -73,60 +73,37 @@ darwin_sys_sigaction(l, v, retval)
syscallarg(struct darwin___sigaction *) nsa;
syscallarg(struct sigaction13 *) osa;
} */ *uap = v;
struct sys___sigaction_sigtramp_args cup;
struct darwin___sigaction dsa;
struct sigaction sa;
struct sigaction *nsa, *osa;
struct sigaction nsa, osa;
struct sigaction13 sa13;
struct proc *p = l->l_proc;
void *sg = stackgap_init(p, 0);
int error;
if ((error = copyin(SCARG(uap, nsa), &dsa, sizeof(dsa))) != 0)
return error;
nsa = stackgap_alloc(p, &sg, sizeof(struct sigaction));
if (SCARG(uap, osa) != NULL)
osa = stackgap_alloc(p, &sg, sizeof(struct sigaction));
else
osa = NULL;
sa.sa_handler = dsa.darwin_sa_handler.__sa_handler;
native_sigset13_to_sigset(&dsa.darwin_sa_mask, &sa.sa_mask);
nsa.sa_handler = dsa.darwin_sa_handler.__sa_handler;
native_sigset13_to_sigset(&dsa.darwin_sa_mask, &nsa.sa_mask);
if (dsa.darwin_sa_flags & ~DARWIN_SA_ALLBITS) {
DPRINTF(("darwin_sys_sigaction: ignoring bits (flags = %x)\n",
dsa.darwin_sa_flags));
}
sa.sa_flags = dsa.darwin_sa_flags & DARWIN_SA_ALLBITS;
nsa.sa_flags = dsa.darwin_sa_flags & DARWIN_SA_ALLBITS;
if ((error = copyout(&sa, nsa, sizeof(sa))) != 0)
return error;
SCARG(&cup, signum) = SCARG(uap, signum);
SCARG(&cup, nsa) = nsa;
if (SCARG(uap, osa) != NULL)
SCARG(&cup, osa) = osa;
SCARG(&cup, tramp) = dsa.darwin_sa_tramp;
SCARG(&cup, vers) = 1;
if ((error = sys___sigaction_sigtramp(l, &cup, retval)) !=0)
error = sigaction1(l, SCARG(uap, signum), &nsa, &osa,
dsa.darwin_sa_tramp, 1);
if (error != 0)
return error;
if (SCARG(uap, osa) == NULL)
return 0;
if ((error = copyin(SCARG(&cup, osa), &sa, sizeof(sa))) != 0)
return error;
/* XXX: The returned structure has a different type to that supplied */
sa13.osa_handler = osa.sa_handler;
sa13.osa_mask = osa.sa_mask.__bits[0];
native_sigset_to_sigset13(&osa.sa_mask, &sa13.osa_mask);
sa13.osa_flags = osa.sa_flags;
sa13.osa_handler = sa.sa_handler;
sa13.osa_mask = sa.sa_mask.__bits[0];
native_sigset_to_sigset13(&sa.sa_mask, &sa13.osa_mask);
sa13.osa_flags = sa.sa_flags;
if ((error = copyout(&sa13, SCARG(uap, osa), sizeof(sa13))) != 0)
return error;
return 0;
return copyout(&sa13, SCARG(uap, osa), sizeof(sa13));
}
void
@ -179,48 +156,24 @@ darwin_sys_sigprocmask(l, v, retval)
syscallarg(sigset13_t *) set;
syscallarg(sigset13_t *) oset;
} */ *uap = v;
struct sys___sigprocmask14_args cup;
struct proc *p = l->l_proc;
int error;
sigset13_t kdset, kdoset;
sigset13_t kdset;
sigset_t kbset, kboset;
sigset_t *ubset = NULL;
sigset_t *uboset = NULL;
void *sg = stackgap_init(p, 0);
ubset = stackgap_alloc(p, &sg, sizeof(*ubset));
if (SCARG(uap, oset) != NULL)
uboset = stackgap_alloc(p, &sg, sizeof(*uboset));
if (SCARG(uap, set) != NULL) {
error = copyin(SCARG(uap, set), &kdset, sizeof(kdset));
if (error != 0)
return error;
native_sigset13_to_sigset(&kdset, &kbset);
error = sigprocmask1(l, SCARG(uap, how), &kbset, &kboset);
} else
error = sigprocmask1(l, SCARG(uap, how), NULL, &kboset);
if ((error = copyout(&kbset, ubset, sizeof(kbset))) != 0)
return error;
}
SCARG(&cup, how) = SCARG(uap, how);
SCARG(&cup, set) = ubset;
SCARG(&cup, oset) = uboset;
if ((error = sys___sigprocmask14(l, &cup, retval)) != 0)
if (SCARG(uap, oset) == NULL || error != 0)
return error;
if (SCARG(uap, oset) != NULL) {
if ((error = copyin(uboset, &kboset, sizeof(kboset))) != 0)
return error;
native_sigset_to_sigset13(&kboset, &kdoset);
if ((error = copyout(&kdoset,
SCARG(uap, oset), sizeof(kdoset))) != 0)
return error;
}
return 0;
native_sigset_to_sigset13(&kboset, &kdset);
return copyout(&kdset, SCARG(uap, oset), sizeof(kdset));
}
void