From 760faf9fdd509e6756dcbfcdec9265f013415b28 Mon Sep 17 00:00:00 2001 From: Konstantin Belousov Date: Fri, 8 Nov 2013 16:57:55 +0000 Subject: [PATCH] Fix signal delivery for the iBCS2 binaries. The iBCS2 sysvec uses current FreeBSD signal trampoline, but does not specifies sv_sigcode_base, since shared page is not mapped. This results in the zero %eip for the signal frame. Fall back to calculating %eip as offset from the psstrings when sv_sigcode_base is not initialized. Reported by: Rich Naill Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/i386/i386/machdep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c index c43031644f8..ad1f0fe8f18 100644 --- a/sys/i386/i386/machdep.c +++ b/sys/i386/i386/machdep.c @@ -757,6 +757,8 @@ sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask) regs->tf_esp = (int)sfp; regs->tf_eip = p->p_sysent->sv_sigcode_base; + if (regs->tf_eip == 0) + regs->tf_eip = p->p_sysent->sv_psstrings - szsigcode; regs->tf_eflags &= ~(PSL_T | PSL_D); regs->tf_cs = _ucodesel; regs->tf_ds = _udatasel;