diff options
| -rw-r--r-- | sys/i386/linux/linux.h | 15 | ||||
| -rw-r--r-- | sys/i386/linux/linux_file.c | 19 | ||||
| -rw-r--r-- | sys/i386/linux/linux_misc.c | 21 | ||||
| -rw-r--r-- | sys/i386/linux/linux_proto.h | 25 | ||||
| -rw-r--r-- | sys/i386/linux/linux_signal.c | 329 | ||||
| -rw-r--r-- | sys/i386/linux/linux_syscall.h | 8 | ||||
| -rw-r--r-- | sys/i386/linux/linux_sysent.c | 14 |
7 files changed, 330 insertions, 101 deletions
diff --git a/sys/i386/linux/linux.h b/sys/i386/linux/linux.h index 146cfb6e8d61..a5337eaaba3a 100644 --- a/sys/i386/linux/linux.h +++ b/sys/i386/linux/linux.h @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux.h,v 1.26.2.4 1999/08/17 21:06:04 marcel Exp $ + * $Id: linux.h,v 1.26.2.5 1999/08/18 07:52:35 marcel Exp $ */ #ifndef _I386_LINUX_LINUX_H_ @@ -57,6 +57,16 @@ typedef struct { } linux_sigaction_t; typedef int linux_key_t; +typedef struct { + unsigned long sig[2]; +} linux_new_sigset_t; +typedef struct { + void (*lsa_handler)(int); + unsigned long lsa_flags; + void (*lsa_restorer)(void); + linux_new_sigset_t lsa_mask; +} linux_new_sigaction_t; + /* * The Linux sigcontext, pretty much a standard 386 trapframe. */ @@ -154,6 +164,9 @@ struct trapframe; /* sigaction flags */ #define LINUX_SA_NOCLDSTOP 0x00000001 +#define LINUX_SA_NOCLDWAIT 0x00000002 +#define LINUX_SA_SIGINFO 0x00000004 +#define LINUX_SA_RESTORER 0x04000000 #define LINUX_SA_ONSTACK 0x08000000 #define LINUX_SA_RESTART 0x10000000 #define LINUX_SA_INTERRUPT 0x20000000 diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c index 40af858299c6..ee96b645780a 100644 --- a/sys/i386/linux/linux_file.c +++ b/sys/i386/linux/linux_file.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_file.c,v 1.23.2.1 1999/08/15 14:29:40 marcel Exp $ + * $Id: linux_file.c,v 1.23.2.2 1999/08/17 09:36:36 marcel Exp $ */ #include "opt_compat.h" @@ -850,3 +850,20 @@ linux_link(struct proc *p, struct linux_link_args *args) return link(p, &bsd); } + +int +linux_getcwd(p, args) + struct proc *p; + struct linux_getcwd_args *args; +{ + struct __getcwd_args bsd; + +#ifdef DEBUG + printf("Linux-emul(%ld): getcwd(%p, %ld)\n", (long)p->p_pid, + args->buf, args->bufsize); +#endif + + bsd.buf = args->buf; + bsd.buflen = args->bufsize; + return (__getcwd(p, &bsd)); +} diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index 6ff7a5ad9e7a..6cda44b67414 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/linux/linux_misc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_misc.c,v 1.51.2.4 1999/08/17 13:16:55 marcel Exp $ + * $Id: linux_misc.c,v 1.51.2.5 1999/08/17 21:06:04 marcel Exp $ */ #include "opt_compat.h" @@ -571,6 +571,25 @@ linux_fork(struct proc *p, struct linux_fork_args *args) return 0; } +int +linux_vfork(p, args) + struct proc *p; + struct linux_vfork_args *args; +{ + int error; + +#ifdef DEBUG + printf("Linux-emul(%ld): vfork()\n", (long)p->p_pid); +#endif + + if ((error = vfork(p, (struct vfork_args *)args)) != 0) + return error; + /* Are we the child? */ + if (p->p_retval[1] == 1) + p->p_retval[0] = 0; + return 0; +} + #define CLONE_VM 0x100 #define CLONE_FS 0x200 #define CLONE_FILES 0x400 diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index e5413d3c71ba..b992f5c59b0d 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * created from Id: syscalls.master,v 1.16.2.3 1999/08/17 21:02:36 marcel Exp + * created from Id: syscalls.master,v 1.16.2.4 1999/08/28 20:36:41 marcel Exp */ #ifndef _LINUX_SYSPROTO_H_ @@ -402,11 +402,30 @@ struct linux_mremap_args { int new_len; char new_len_[PAD_(int)]; int flags; char flags_[PAD_(int)]; }; +struct linux_rt_sigaction_args { + int sig; char sig_[PAD_(int)]; + struct linux_new_sigaction * act; char act_[PAD_(struct linux_new_sigaction *)]; + struct linux_new_sigaction * oact; char oact_[PAD_(struct linux_new_sigaction *)]; + size_t sigsetsize; char sigsetsize_[PAD_(size_t)]; +}; +struct linux_rt_sigprocmask_args { + int how; char how_[PAD_(int)]; + struct linux_new_sigset * mask; char mask_[PAD_(struct linux_new_sigset *)]; + struct linux_new_sigset * omask; char omask_[PAD_(struct linux_new_sigset *)]; + size_t sigsetsize; char sigsetsize_[PAD_(size_t)]; +}; struct linux_chown_args { char * path; char path_[PAD_(char *)]; int uid; char uid_[PAD_(int)]; int gid; char gid_[PAD_(int)]; }; +struct linux_getcwd_args { + char * buf; char buf_[PAD_(char *)]; + unsigned long bufsize; char bufsize_[PAD_(unsigned long)]; +}; +struct linux_vfork_args { + register_t dummy; +}; int linux_setup __P((struct proc *, struct linux_setup_args *)); int linux_fork __P((struct proc *, struct linux_fork_args *)); int linux_open __P((struct proc *, struct linux_open_args *)); @@ -509,7 +528,11 @@ int linux_msync __P((struct proc *, struct linux_msync_args *)); int linux_sched_setscheduler __P((struct proc *, struct linux_sched_setscheduler_args *)); int linux_sched_getscheduler __P((struct proc *, struct linux_sched_getscheduler_args *)); int linux_mremap __P((struct proc *, struct linux_mremap_args *)); +int linux_rt_sigaction __P((struct proc *, struct linux_rt_sigaction_args *)); +int linux_rt_sigprocmask __P((struct proc *, struct linux_rt_sigprocmask_args *)); int linux_chown __P((struct proc *, struct linux_chown_args *)); +int linux_getcwd __P((struct proc *, struct linux_getcwd_args *)); +int linux_vfork __P((struct proc *, struct linux_vfork_args *)); #ifdef COMPAT_43 diff --git a/sys/i386/linux/linux_signal.c b/sys/i386/linux/linux_signal.c index 1f71bf53df09..db66d85661db 100644 --- a/sys/i386/linux/linux_signal.c +++ b/sys/i386/linux/linux_signal.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_signal.c,v 1.13 1998/10/11 04:54:16 jdp Exp $ + * $Id: linux_signal.c,v 1.14 1998/12/21 19:21:36 sos Exp $ */ #include <sys/param.h> @@ -74,6 +74,8 @@ linux_to_bsd_sigaction(linux_sigaction_t *lsa, struct sigaction *bsa) bsa->sa_flags = 0; if (lsa->sa_flags & LINUX_SA_NOCLDSTOP) bsa->sa_flags |= SA_NOCLDSTOP; + if (lsa->sa_flags & LINUX_SA_NOCLDWAIT) + bsa->sa_flags |= SA_NOCLDWAIT; if (lsa->sa_flags & LINUX_SA_ONSTACK) bsa->sa_flags |= SA_ONSTACK; if (lsa->sa_flags & LINUX_SA_RESTART) @@ -93,6 +95,8 @@ bsd_to_linux_sigaction(struct sigaction *bsa, linux_sigaction_t *lsa) lsa->sa_flags = 0; if (bsa->sa_flags & SA_NOCLDSTOP) lsa->sa_flags |= LINUX_SA_NOCLDSTOP; + if (bsa->sa_flags & SA_NOCLDWAIT) + lsa->sa_flags |= LINUX_SA_NOCLDWAIT; if (bsa->sa_flags & SA_ONSTACK) lsa->sa_flags |= LINUX_SA_ONSTACK; if (bsa->sa_flags & SA_RESTART) @@ -103,128 +107,269 @@ bsd_to_linux_sigaction(struct sigaction *bsa, linux_sigaction_t *lsa) lsa->sa_flags |= LINUX_SA_NOMASK; } +static int +linux_do_sigaction(struct proc *p, int linux_sig, linux_sigaction_t *linux_nsa, + linux_sigaction_t *linux_osa) +{ + struct sigaction *nsa, *osa, sa; + struct sigaction_args sa_args; + int error; + caddr_t sg = stackgap_init(); + + if (linux_sig <= 0 || linux_sig >= LINUX_NSIG) + return EINVAL; + + if (linux_osa) + osa = stackgap_alloc(&sg, sizeof(struct sigaction)); + else + osa = NULL; + + if (linux_nsa) { + nsa = stackgap_alloc(&sg, sizeof(struct sigaction)); + linux_to_bsd_sigaction(linux_nsa, &sa); + error = copyout(&sa, nsa, sizeof(struct sigaction)); + if (error) + return error; + } + else + nsa = NULL; + + sa_args.signum = linux_to_bsd_signal[linux_sig]; + sa_args.nsa = nsa; + sa_args.osa = osa; + error = sigaction(p, &sa_args); + if (error) + return error; + + if (linux_osa) { + error = copyin(osa, &sa, sizeof(struct sigaction)); + if (error) + return error; + bsd_to_linux_sigaction(&sa, linux_osa); + } + + return 0; +} + int linux_sigaction(struct proc *p, struct linux_sigaction_args *args) { - linux_sigaction_t linux_sa; - struct sigaction *nsa = NULL, *osa = NULL, bsd_sa; - struct sigaction_args sa; - int error; - caddr_t sg = stackgap_init(); - + linux_sigaction_t nsa, osa; + int error; + #ifdef DEBUG - printf("Linux-emul(%ld): sigaction(%d, %p, %p)\n", - (long)p->p_pid, args->sig, (void *)args->nsa, (void *)args->osa); + printf("Linux-emul(%ld): sigaction(%d, %p, %p)\n", (long)p->p_pid, + args->sig, (void *)args->nsa, (void *)args->osa); #endif - if (args->sig <= 0 || args->sig >= LINUX_NSIG) - return EINVAL; - if (args->osa) - osa = (struct sigaction *)stackgap_alloc(&sg, sizeof(struct sigaction)); - - if (args->nsa) { - nsa = (struct sigaction *)stackgap_alloc(&sg, sizeof(struct sigaction)); - if (error = copyin(args->nsa, &linux_sa, sizeof(linux_sigaction_t))) - return error; - linux_to_bsd_sigaction(&linux_sa, &bsd_sa); - if (error = copyout(&bsd_sa, nsa, sizeof(struct sigaction))) - return error; - } - sa.signum = linux_to_bsd_signal[args->sig]; - sa.nsa = nsa; - sa.osa = osa; - if ((error = sigaction(p, &sa))) - return error; - if (args->osa) { - if (error = copyin(osa, &bsd_sa, sizeof(struct sigaction))) - return error; - bsd_to_linux_sigaction(&bsd_sa, &linux_sa); - if (error = copyout(&linux_sa, args->osa, sizeof(linux_sigaction_t))) - return error; - } - return 0; + if (args->nsa) { + error = copyin(args->nsa, &nsa, sizeof(linux_sigaction_t)); + if (error) + return error; + } + + error = linux_do_sigaction(p, args->sig, + args->nsa ? &nsa : NULL, + args->osa ? &osa : NULL); + if (error) + return error; + + if (args->osa) { + error = copyout(&osa, args->osa, sizeof(linux_sigaction_t)); + if (error) + return error; + } + + return 0; } int linux_signal(struct proc *p, struct linux_signal_args *args) { - caddr_t sg; - struct sigaction_args sa_args; - struct sigaction *osa, *nsa, tmpsa; - int error; + linux_sigaction_t nsa, osa; + int error; #ifdef DEBUG - printf("Linux-emul(%ld): signal(%d, %p)\n", - (long)p->p_pid, args->sig, (void *)args->handler); + printf("Linux-emul(%ld): signal(%d, %p)\n", (long)p->p_pid, + args->sig, (void *)args->handler); #endif - if (args->sig <= 0 || args->sig >= LINUX_NSIG) - return EINVAL; - sg = stackgap_init(); - nsa = stackgap_alloc(&sg, sizeof *nsa); - osa = stackgap_alloc(&sg, sizeof *osa); - - tmpsa.sa_handler = args->handler; - tmpsa.sa_mask = (sigset_t) 0; - tmpsa.sa_flags = SA_RESETHAND | SA_NODEFER; - if ((error = copyout(&tmpsa, nsa, sizeof tmpsa))) - return error; - sa_args.signum = linux_to_bsd_signal[args->sig]; - sa_args.osa = osa; - sa_args.nsa = nsa; - if ((error = sigaction(p, &sa_args))) - return error; + nsa.sa_handler = args->handler; + nsa.sa_flags = LINUX_SA_ONESHOT | LINUX_SA_NOMASK; + nsa.sa_mask = NULL; - if ((error = copyin(osa, &tmpsa, sizeof *osa))) - return error; + error = linux_do_sigaction(p, args->sig, &nsa, &osa); - p->p_retval[0] = (int)tmpsa.sa_handler; + p->p_retval[0] = (int)osa.sa_handler; - return 0; + return 0; } +int +linux_rt_sigaction(struct proc *p, struct linux_rt_sigaction_args *args) +{ + linux_sigaction_t nsa, osa; + linux_new_sigaction_t new_sa; + int error; + +#ifdef DEBUG + printf("Linux-emul(%ld): rt_sigaction(%d, %p, %p, %d)\n", + (long)p->p_pid, args->sig, (void *)args->act, + (void *)args->oact, args->sigsetsize); +#endif + + if (args->sigsetsize != sizeof(linux_new_sigset_t)) + return EINVAL; + +#ifdef DEBUG + if (args->sig >= LINUX_NSIG) { + printf("LINUX(%ld): rt_sigaction: 64-bit signal (%d)\n", + (long)p->p_pid, args->sig); + } +#endif + + if (args->act) { + error = copyin(args->act, &new_sa, sizeof(linux_new_sigaction_t)); + if (error) + return error; + + nsa.sa_handler = new_sa.lsa_handler; + nsa.sa_mask = new_sa.lsa_mask.sig[0]; + nsa.sa_flags = new_sa.lsa_flags; + nsa.sa_restorer = new_sa.lsa_restorer; + +#ifdef DEBUG + if (new_sa.lsa_mask.sig[1] != 0) + printf("LINUX(%ld): rt_sigaction: sig[1] = 0x%08lx\n", + (long)p->p_pid, new_sa.lsa_mask.sig[1]); +#endif + } + + error = linux_do_sigaction(p, args->sig, + args->act ? &nsa : NULL, + args->oact ? &osa : NULL); + if (error) + return error; + + if (args->oact) { + new_sa.lsa_handler = osa.sa_handler; + new_sa.lsa_flags = osa.sa_flags; + new_sa.lsa_restorer = osa.sa_restorer; + new_sa.lsa_mask.sig[0] = osa.sa_mask; + new_sa.lsa_mask.sig[1] = 0; + error = copyout(&osa, args->oact, sizeof(linux_new_sigaction_t)); + if (error) + return error; + } + + return 0; +} + +static int +linux_do_sigprocmask(struct proc *p, int how, linux_sigset_t *new, + linux_sigset_t *old) +{ + int error = 0, s; + sigset_t mask; + + p->p_retval[0] = 0; + + if (old != NULL) + *old = bsd_to_linux_sigset(p->p_sigmask); + + if (new != NULL) { + mask = linux_to_bsd_sigset(*new); + + s = splhigh(); + + switch (how) { + case LINUX_SIG_BLOCK: + p->p_sigmask |= (mask & ~sigcantmask); + break; + case LINUX_SIG_UNBLOCK: + p->p_sigmask &= ~mask; + break; + case LINUX_SIG_SETMASK: + p->p_sigmask = (mask & ~sigcantmask); + break; + default: + error = EINVAL; + break; + } + + splx(s); + } + + return error; +} int linux_sigprocmask(struct proc *p, struct linux_sigprocmask_args *args) { - int error, s; - sigset_t mask; - sigset_t omask; + linux_sigset_t mask; + linux_sigset_t omask; + int error; #ifdef DEBUG - printf("Linux-emul(%d): sigprocmask(%d, *, *)\n", p->p_pid, args->how); + printf("Linux-emul(%ld): sigprocmask(%d, *, *)\n", (long)p->p_pid, + args->how); #endif - p->p_retval[0] = 0; + if (args->mask != NULL) { + error = copyin(args->mask, &mask, sizeof(linux_sigset_t)); + if (error) + return error; + } + + error = linux_do_sigprocmask(p, args->how, + args->mask ? &mask : NULL, + args->omask ? &omask : NULL); + + if (!error && args->omask != NULL) { + error = copyout(&omask, args->omask, sizeof(linux_sigset_t)); + } - if (args->omask != NULL) { - omask = bsd_to_linux_sigset(p->p_sigmask); - if (error = copyout(&omask, args->omask, sizeof(sigset_t))) - return error; - } - if (!(args->mask)) - return 0; - if (error = copyin(args->mask, &mask, sizeof(linux_sigset_t))) return error; +} - mask = linux_to_bsd_sigset(mask); - s = splhigh(); - switch (args->how) { - case LINUX_SIG_BLOCK: - p->p_sigmask |= (mask & ~sigcantmask); - break; - case LINUX_SIG_UNBLOCK: - p->p_sigmask &= ~mask; - break; - case LINUX_SIG_SETMASK: - p->p_sigmask = (mask & ~sigcantmask); - break; - default: - error = EINVAL; - break; - } - splx(s); - return error; +int +linux_rt_sigprocmask(struct proc *p, struct linux_rt_sigprocmask_args *args) +{ + linux_new_sigset_t new_mask; + linux_sigset_t old_mask; + int error; + +#ifdef DEBUG + printf("Linux-emul(%ld): rt_sigprocmask(%d, %p, %p, %d)\n", + (long)p->p_pid, args->how, (void *)args->mask, + (void *)args->omask, args->sigsetsize); +#endif + + if (args->sigsetsize != sizeof(linux_new_sigset_t)) + return EINVAL; + + if (args->mask != NULL) { + error = copyin(args->mask, &new_mask, sizeof(linux_new_sigset_t)); + if (error) + return error; + +#ifdef DEBUG + if (new_mask.sig[1] != 0) + printf("LINUX(%ld): rt_sigprocmask: sig[1] = 0x%08lx\n", + (long)p->p_pid, new_mask.sig[1]); +#endif + } + + error = linux_do_sigprocmask(p, args->how, + args->mask ? new_mask.sig : NULL, + args->omask ? &old_mask : NULL); + + if (!error && args->omask != NULL) { + new_mask.sig[0] = old_mask; + error = copyout(&new_mask, args->omask, sizeof(linux_new_sigset_t)); + } + + return error; } int diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h index c842b3629e85..6f20dcc262d4 100644 --- a/sys/i386/linux/linux_syscall.h +++ b/sys/i386/linux/linux_syscall.h @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from Id: syscalls.master,v 1.16.2.3 1999/08/17 21:02:36 marcel Exp + * created from Id: syscalls.master,v 1.16.2.4 1999/08/28 20:36:41 marcel Exp */ #define LINUX_SYS_linux_setup 0 @@ -163,5 +163,9 @@ #define LINUX_SYS_nanosleep 162 #define LINUX_SYS_linux_mremap 163 #define LINUX_SYS_poll 168 +#define LINUX_SYS_linux_rt_sigaction 174 +#define LINUX_SYS_linux_rt_sigprocmask 175 #define LINUX_SYS_linux_chown 182 -#define LINUX_SYS_MAXSYSCALL 183 +#define LINUX_SYS_linux_getcwd 183 +#define LINUX_SYS_linux_vfork 190 +#define LINUX_SYS_MAXSYSCALL 191 diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c index 39ac0275b204..44f864cf5124 100644 --- a/sys/i386/linux/linux_sysent.c +++ b/sys/i386/linux/linux_sysent.c @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from Id: syscalls.master,v 1.16.2.3 1999/08/17 21:02:36 marcel Exp + * created from Id: syscalls.master,v 1.16.2.4 1999/08/28 20:36:41 marcel Exp */ #include "opt_compat.h" @@ -188,8 +188,8 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)nosys }, /* 171 = getresgid */ { 0, (sy_call_t *)nosys }, /* 172 = prctl */ { 0, (sy_call_t *)nosys }, /* 173 = rt_sigreturn */ - { 0, (sy_call_t *)nosys }, /* 174 = rt_sigaction */ - { 0, (sy_call_t *)nosys }, /* 175 = rt_sigprocmask */ + { 4, (sy_call_t *)linux_rt_sigaction }, /* 174 = linux_rt_sigaction */ + { 4, (sy_call_t *)linux_rt_sigprocmask }, /* 175 = linux_rt_sigprocmask */ { 0, (sy_call_t *)nosys }, /* 176 = rt_sigpending */ { 0, (sy_call_t *)nosys }, /* 177 = rt_sigtimedwait */ { 0, (sy_call_t *)nosys }, /* 178 = rt_sigqueueinfo */ @@ -197,4 +197,12 @@ struct sysent linux_sysent[] = { { 0, (sy_call_t *)nosys }, /* 180 = pread */ { 0, (sy_call_t *)nosys }, /* 181 = pwrite */ { 3, (sy_call_t *)linux_chown }, /* 182 = linux_chown */ + { 2, (sy_call_t *)linux_getcwd }, /* 183 = linux_getcwd */ + { 0, (sy_call_t *)nosys }, /* 184 = capget */ + { 0, (sy_call_t *)nosys }, /* 185 = capset */ + { 0, (sy_call_t *)nosys }, /* 186 = sigaltstack */ + { 0, (sy_call_t *)nosys }, /* 187 = sendfile */ + { 0, (sy_call_t *)nosys }, /* 188 = getpmsg */ + { 0, (sy_call_t *)nosys }, /* 189 = putpmsg */ + { 0, (sy_call_t *)linux_vfork }, /* 190 = linux_vfork */ }; |