diff options
| author | KATO Takenori <kato@FreeBSD.org> | 1999-10-01 12:46:08 +0000 |
|---|---|---|
| committer | KATO Takenori <kato@FreeBSD.org> | 1999-10-01 12:46:08 +0000 |
| commit | f2c921c4c8c9ebdfff0bdf2b203cbec356f95a7c (patch) | |
| tree | 69e4e01f23961bbb61a77bfc10c0a4bd58919142 /sys | |
| parent | 8b126f131d2a08d92288bb27df825923c6abf6d2 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/i386/machdep.c | 15 | ||||
| -rw-r--r-- | sys/pc98/pc98/machdep.c | 15 |
2 files changed, 16 insertions, 14 deletions
diff --git a/sys/pc98/i386/machdep.c b/sys/pc98/i386/machdep.c index 2bc0d2cbfd5b..416443c5c15c 100644 --- a/sys/pc98/i386/machdep.c +++ b/sys/pc98/i386/machdep.c @@ -639,7 +639,7 @@ sendsig(catcher, sig, mask, code) psp = p->p_sigacts; /* save user context */ - sf.sf_uc.uc_link = NULL; + bzero(&sf, sizeof(struct sigframe)); sf.sf_uc.uc_sigmask = *mask; sf.sf_uc.uc_stack = psp->ps_sigstk; sf.sf_uc.uc_mcontext.mc_tf = *regs; @@ -695,7 +695,7 @@ sendsig(catcher, sig, mask, code) /* fill siginfo structure */ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; - sf.sf_si.si_pid = p->p_pid; + sf.sf_si.si_addr = (void*)regs->tf_err; } else { /* Old FreeBSD-style arguments. */ @@ -898,7 +898,7 @@ sigreturn(p, uap) struct trapframe *regs; ucontext_t *ucp; struct sigframe *sfp; - int eflags; + int cs, eflags; regs = p->p_md.md_regs; ucp = uap->sigcntxp; @@ -961,18 +961,19 @@ sigreturn(p, uap) return(EINVAL); } - *regs = ucp->uc_mcontext.mc_tf; - /* * Don't allow users to load a valid privileged %cs. Let the * hardware check for invalid selectors, excess privilege in * other selectors, invalid %eip's and invalid %esp's. */ - if (!CS_SECURE(regs->tf_cs)) { - printf("sigreturn: cs = 0x%x\n", regs->tf_cs); + cs = ucp->uc_mcontext.mc_tf.tf_cs; + if (!CS_SECURE(cs)) { + printf("sigreturn: cs = 0x%x\n", cs); trapsignal(p, SIGBUS, T_PROTFLT); return(EINVAL); } + + *regs = ucp->uc_mcontext.mc_tf; } p->p_sigacts->ps_sigstk = ucp->uc_stack; diff --git a/sys/pc98/pc98/machdep.c b/sys/pc98/pc98/machdep.c index 2bc0d2cbfd5b..416443c5c15c 100644 --- a/sys/pc98/pc98/machdep.c +++ b/sys/pc98/pc98/machdep.c @@ -639,7 +639,7 @@ sendsig(catcher, sig, mask, code) psp = p->p_sigacts; /* save user context */ - sf.sf_uc.uc_link = NULL; + bzero(&sf, sizeof(struct sigframe)); sf.sf_uc.uc_sigmask = *mask; sf.sf_uc.uc_stack = psp->ps_sigstk; sf.sf_uc.uc_mcontext.mc_tf = *regs; @@ -695,7 +695,7 @@ sendsig(catcher, sig, mask, code) /* fill siginfo structure */ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; - sf.sf_si.si_pid = p->p_pid; + sf.sf_si.si_addr = (void*)regs->tf_err; } else { /* Old FreeBSD-style arguments. */ @@ -898,7 +898,7 @@ sigreturn(p, uap) struct trapframe *regs; ucontext_t *ucp; struct sigframe *sfp; - int eflags; + int cs, eflags; regs = p->p_md.md_regs; ucp = uap->sigcntxp; @@ -961,18 +961,19 @@ sigreturn(p, uap) return(EINVAL); } - *regs = ucp->uc_mcontext.mc_tf; - /* * Don't allow users to load a valid privileged %cs. Let the * hardware check for invalid selectors, excess privilege in * other selectors, invalid %eip's and invalid %esp's. */ - if (!CS_SECURE(regs->tf_cs)) { - printf("sigreturn: cs = 0x%x\n", regs->tf_cs); + cs = ucp->uc_mcontext.mc_tf.tf_cs; + if (!CS_SECURE(cs)) { + printf("sigreturn: cs = 0x%x\n", cs); trapsignal(p, SIGBUS, T_PROTFLT); return(EINVAL); } + + *regs = ucp->uc_mcontext.mc_tf; } p->p_sigacts->ps_sigstk = ucp->uc_stack; |