diff options
author | Lev Rumyantsev <levarum@google.com> | 2020-06-01 18:43:55 -0700 |
---|---|---|
committer | Lev Rumyantsev <levarum@google.com> | 2020-06-09 21:33:33 +0000 |
commit | c8c3bc58a1e2acb1048e2fb4f2914f60e0977942 (patch) | |
tree | 0836a0c8dce0e15b31fe3a9ac5e15c7f32ac2d41 | |
parent | 8b26ca41647096776a5170a84ac65eccadc6732d (diff) | |
download | bionic-c8c3bc58a1e2acb1048e2fb4f2914f60e0977942.tar.gz |
Move set_cached_pid() to __clone_for_fork()
Bug: 145028007
Test: bionic-unit-tests
Merged-In: I3c697924f2a3ef1804a688dd1fe9669f6b7a71bf
Change-Id: I3c697924f2a3ef1804a688dd1fe9669f6b7a71bf
(cherry picked from commit 3a4c2ffff80402f6c250f1491302aa7d65411349)
-rw-r--r-- | libc/bionic/fork.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/libc/bionic/fork.cpp b/libc/bionic/fork.cpp index a3fdcd2d5..3814ed0ac 100644 --- a/libc/bionic/fork.cpp +++ b/libc/bionic/fork.cpp @@ -37,8 +37,16 @@ __BIONIC_WEAK_FOR_NATIVE_BRIDGE int __clone_for_fork() { pthread_internal_t* self = __get_thread(); - return clone(nullptr, nullptr, (CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD), nullptr, - nullptr, nullptr, &(self->tid)); + int result = clone(nullptr, nullptr, (CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD), + nullptr, nullptr, nullptr, &(self->tid)); + + if (result == 0) { + // Update the cached pid in child, since clone() will not set it directly (as + // self->tid is updated by the kernel). + self->set_cached_pid(gettid()); + } + + return result; } int fork() { @@ -47,10 +55,6 @@ int fork() { int result = __clone_for_fork(); if (result == 0) { - // Update the cached pid, since clone() will not set it directly (as - // self->tid is updated by the kernel). - __get_thread()->set_cached_pid(gettid()); - // Disable fdsan post-fork, so we don't falsely trigger on processes that // fork, close all of their fds blindly, and then exec. android_fdsan_set_error_level(ANDROID_FDSAN_ERROR_LEVEL_DISABLED); |