aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/misc_64.S
diff options
context:
space:
mode:
authorJosh Poimboeuf <jpoimboe@us.ibm.com>2008-10-07 02:10:03 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2008-10-10 00:55:18 -0400
commit41c2e949cb7b80c5a6247c7df97759953b0f71b5 (patch)
treec8ba92fa5cd1dc7f6293552704e639135008c343 /arch/powerpc/kernel/misc_64.S
parent99c840668c23fa81ac642598c792926021329747 (diff)
powerpc: Fix error path in kernel_thread function
The powerpc 32-bit and 64-bit kernel_thread functions don't properly propagate errors being returned by the clone syscall. (In the case of error, the syscall exit code returns a positive errno in r3 and sets the CR0[SO] bit.) This patch fixes that by negating r3 if CR0[SO] is set after the syscall. Signed-off-by: Josh Poimboeuf <jpoimboe@us.ibm.com> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com> Acked-by: Paul Mackerras <paulus@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/misc_64.S')
-rw-r--r--arch/powerpc/kernel/misc_64.S8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 4dd70cf7bb4e..3053fe5c62f2 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -426,8 +426,10 @@ _GLOBAL(kernel_thread)
426 li r4,0 /* new sp (unused) */ 426 li r4,0 /* new sp (unused) */
427 li r0,__NR_clone 427 li r0,__NR_clone
428 sc 428 sc
429 cmpdi 0,r3,0 /* parent or child? */ 429 bns+ 1f /* did system call indicate error? */
430 bne 1f /* return if parent */ 430 neg r3,r3 /* if so, make return code negative */
4311: cmpdi 0,r3,0 /* parent or child? */
432 bne 2f /* return if parent */
431 li r0,0 433 li r0,0
432 stdu r0,-STACK_FRAME_OVERHEAD(r1) 434 stdu r0,-STACK_FRAME_OVERHEAD(r1)
433 ld r2,8(r29) 435 ld r2,8(r29)
@@ -438,7 +440,7 @@ _GLOBAL(kernel_thread)
438 li r0,__NR_exit /* exit after child exits */ 440 li r0,__NR_exit /* exit after child exits */
439 li r3,0 441 li r3,0
440 sc 442 sc
4411: addi r1,r1,STACK_FRAME_OVERHEAD 4432: addi r1,r1,STACK_FRAME_OVERHEAD
442 ld r29,-24(r1) 444 ld r29,-24(r1)
443 ld r30,-16(r1) 445 ld r30,-16(r1)
444 blr 446 blr