Date: Wed, 4 Jun 2014 06:21:55 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r267040 - stable/10/sys/powerpc/powerpc Message-ID: <201406040621.s546LtSA008332@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Wed Jun 4 06:21:54 2014 New Revision: 267040 URL: http://svnweb.freebsd.org/changeset/base/267040 Log: MFC r266778: Repair nested signal handling on PowerPC. The signal trampoline code was not allocating space for the parameter save area in the stack frame. If the compiler chose to save the argument to the signal handler on the stack, it would overwrite the first 32 bits of the sigaction struct with it, corrupting it for a subsequent invocation. PR: powerpc/183040 Modified: stable/10/sys/powerpc/powerpc/sigcode32.S stable/10/sys/powerpc/powerpc/sigcode64.S Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/powerpc/powerpc/sigcode32.S ============================================================================== --- stable/10/sys/powerpc/powerpc/sigcode32.S Wed Jun 4 06:15:45 2014 (r267039) +++ stable/10/sys/powerpc/powerpc/sigcode32.S Wed Jun 4 06:21:54 2014 (r267040) @@ -45,9 +45,9 @@ */ .globl CNAME(sigcode32),CNAME(szsigcode32) CNAME(sigcode32): - addi 1,1,-16 /* reserved space for callee */ + addi 1,1,-20 /* reserved space for callee */ blrl - addi 3,1,16+SF_UC /* restore sp, and get &frame->sf_uc */ + addi 3,1,20+SF_UC /* restore sp, and get &frame->sf_uc */ li 0,SYS_sigreturn sc /* sigreturn(scp) */ li 0,SYS_exit Modified: stable/10/sys/powerpc/powerpc/sigcode64.S ============================================================================== --- stable/10/sys/powerpc/powerpc/sigcode64.S Wed Jun 4 06:15:45 2014 (r267039) +++ stable/10/sys/powerpc/powerpc/sigcode64.S Wed Jun 4 06:21:54 2014 (r267040) @@ -45,7 +45,7 @@ */ .globl CNAME(sigcode64),CNAME(szsigcode64) CNAME(sigcode64): - addi 1,1,-48 /* reserved space for callee */ + addi 1,1,-112 /* reserved space for callee */ mflr 2 /* resolve function descriptor */ ld 0,0(2) ld 2,8(2) @@ -53,7 +53,7 @@ CNAME(sigcode64): blrl - addi 3,1,48+SF_UC /* restore sp, and get &frame->sf_uc */ + addi 3,1,112+SF_UC /* restore sp, and get &frame->sf_uc */ li 0,SYS_sigreturn sc /* sigreturn(scp) */ li 0,SYS_exit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406040621.s546LtSA008332>