From: Rich Felker <dalias@aerifal.cx>
Date: Mon, 19 Nov 2012 03:57:32 +0000 (-0500)
Subject: fix powerpc asm not to store data in volatile space below stack pointer
X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=commitdiff_plain;h=9565a349f217fb6f532fac06b7ef458a32c2ad2e

fix powerpc asm not to store data in volatile space below stack pointer

it's essential to decrement the stack pointer before writing to new
stack space, rather than afterwards. otherwise there is a race
condition during which asynchronous code (signals) could clobber the
data being stored.

it may be possible to optimize the code further using stwu, but I
wanted to avoid making any changes to the actual stack layout in this
commit. further improvements can be made separately if desired.
---

diff --git a/src/signal/powerpc/sigsetjmp.s b/src/signal/powerpc/sigsetjmp.s
index 81f5a40e..deed732f 100644
--- a/src/signal/powerpc/sigsetjmp.s
+++ b/src/signal/powerpc/sigsetjmp.s
@@ -10,25 +10,25 @@ sigsetjmp:
 	#2) if its 0, goto setjmp code
 	beq- cr7, 1f
 	#3) else: we must call pthread_sigmask(SIG_SETMASK, 0, (sigset_t *)buf->__ss);
+	# increase stack frame by 16
+	subi 1, 1, 16
 	# thus store r3 on the stack, to restore it later
-	stw 3, -4(1)
+	stw 3, 12(1)
 	# store old link reg
 	mflr 0
-	stw 0, -8(1)
-	# increase stack frame by 16
-	subi 1, 1, 16
+	stw 0, 8(1)
 	# put pointer to ss buf into r5 (3rd arg)
 	addi 5, 3, 260
 	# put "2" i.e. SIG_SETMASK in r3
 	li 3, 2
 	li 4, 0
 	bl pthread_sigmask
-	#restore sp
-	addi 1, 1, 16
 	#restore r3
-	lwz 3, -4(1)
+	lwz 3, 12(1)
 	#restore link reg
-	lwz 0, -8(1)
+	lwz 0, 8(1)
 	mtlr 0
+	#restore sp
+	addi 1, 1, 16
 1:
 	b setjmp
diff --git a/src/thread/powerpc/clone.s b/src/thread/powerpc/clone.s
index cea69e99..54a2314e 100644
--- a/src/thread/powerpc/clone.s
+++ b/src/thread/powerpc/clone.s
@@ -16,9 +16,9 @@ __clone:
 # in order that the child can find the start func and its arg, we need to store it into
 # non-volative regs. to do so, we have to store those 2 regs into our stackframe, so
 # we can restore them later.
-stw 30, -4(1)
-stw 31, -8(1)
 subi 1, 1, 16 
+stw 30, 12(1)
+stw 31, 8(1)
 
 # save r3 (func) into r30, and r6(arg) into r31
 mr 30, 3
@@ -72,9 +72,9 @@ sc
 2:
 
 # restore stack
+lwz 30, 12(1)
+lwz 31, 8(1)
 addi 1, 1, 16
-lwz 30, -4(1)
-lwz 31, -8(1)
 
 blr