From bd7a892c300a2c257bd7422f56325c575765b09a Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 5 Jun 2014 12:28:14 -0700
Subject: [PATCH] Fix unwinding through x86-64 __bionic_clone.

x86-64 needs these CFI directives to stop unwinding here.
I've also cleaned up the assembler a little, and made x86 and x86-64
a little more alike.

Bug: 15195760

(cherry picked from commit aeb3016f8132689d1b49d30056005b667e3d2d0e)

Change-Id: I511fe238b1ef1a1c16aef735f93bbee9accb0689
---
 libc/arch-x86/bionic/__bionic_clone.S    |  6 +++---
 libc/arch-x86_64/bionic/__bionic_clone.S | 20 ++++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/libc/arch-x86/bionic/__bionic_clone.S b/libc/arch-x86/bionic/__bionic_clone.S
index 7c972de54..672512c52 100644
--- a/libc/arch-x86/bionic/__bionic_clone.S
+++ b/libc/arch-x86/bionic/__bionic_clone.S
@@ -25,8 +25,8 @@ ENTRY(__bionic_clone)
         int     $0x80
 
         # Check result.
-        cmpl    $0, %eax
-        je      .L_bc_child
+        testl    %eax, %eax
+        jz      .L_bc_child
         jg      .L_bc_parent
 
         # An error occurred, so set errno and return -1.
@@ -44,7 +44,7 @@ ENTRY(__bionic_clone)
         hlt
 
 .L_bc_parent:
-        # we're the parent; nothing to do.
+        # We're the parent; nothing to do.
 .L_bc_return:
         popl    %edi
         popl    %esi
diff --git a/libc/arch-x86_64/bionic/__bionic_clone.S b/libc/arch-x86_64/bionic/__bionic_clone.S
index db7d05c28..7fe44a233 100644
--- a/libc/arch-x86_64/bionic/__bionic_clone.S
+++ b/libc/arch-x86_64/bionic/__bionic_clone.S
@@ -45,17 +45,23 @@ ENTRY(__bionic_clone)
         # Make the system call.
         movl    $__NR_clone, %eax
         syscall
-        testl   %eax, %eax
-        jns     1f
+
+        # Check result.
+        testq   %rax, %rax
+        jz      .L_bc_child
+        jg      .L_bc_parent
 
         # An error occurred, set errno and return -1.
         negl    %eax
         movl    %eax, %edi
         call    __set_errno
         orl     $-1, %eax
-        jmp     2f
-1:
-        jnz     2f
+        ret
+
+.L_bc_child:
+        # We don't want anyone to unwind past this point.
+        .cfi_undefined %rip
+        .cfi_undefined %rbp
 
         # We're in the child now, so call __bionic_clone_entry
         # with the arguments from the child stack moved into
@@ -64,7 +70,9 @@ ENTRY(__bionic_clone)
         popq    %rsi  # arg
         call    __bionic_clone_entry
         hlt
-2:
+
+.L_bc_parent:
+        # We're the parent; nothing to do.
         ret
 END(__bionic_clone)
 .hidden __bionic_clone