d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair nested signal handling on PowerPC. The signal trampoline code

Browse Source 
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
MFC after:	8 days
This commit is contained in:
Nathan Whitehorn 2014-05-27 23:57:22 +00:00
parent d8229aaf73
commit 0fd326573b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/powerpc/powerpc/sigcode32.S
View File

@ -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

4
sys/powerpc/powerpc/sigcode64.S
View File

@ -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