summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorJerry Jelinek <jerry.jelinek@joyent.com>2014-07-18 17:04:55 +0000
committerJerry Jelinek <jerry.jelinek@joyent.com>2014-07-18 17:04:55 +0000
commit1fba5429ccf7095093d8035f56380cf7b125f0f2 (patch)
treec84db2b3b58ddc9e06921978306182ad602c6415 /usr/src
parentabd4d6f0c97083f017e7a6825da12dabfbad9130 (diff)
downloadillumos-joyent-1fba5429ccf7095093d8035f56380cf7b125f0f2.tar.gz
OS-3206 lx brand code at a possibly unreached point in clone.c
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/lib/brand/lx/lx_brand/common/clone.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr/src/lib/brand/lx/lx_brand/common/clone.c b/usr/src/lib/brand/lx/lx_brand/common/clone.c
index abd5fdea04..e27676ec5f 100644
--- a/usr/src/lib/brand/lx/lx_brand/common/clone.c
+++ b/usr/src/lib/brand/lx/lx_brand/common/clone.c
@@ -467,13 +467,17 @@ lx_clone(uintptr_t p1, uintptr_t p2, uintptr_t p3, uintptr_t p4,
}
/*
+ * lx_setup_clone() doesn't return below, so stop now, if
+ * necessary.
+ */
+ lx_ptrace_stop_if_option(LX_PTRACE_O_TRACECLONE);
+
+ /*
* If provided, the child needs its new stack set up.
*/
if (cldstk)
lx_setup_clone(rp->lxr_gs, (void *)rp->lxr_eip, cldstk);
- /* lx_setup_clone() doesn't return */
- lx_ptrace_stop_if_option(LX_PTRACE_O_TRACECLONE);
return (0);
}