commit 798abe862f40f76b0d73aac34a87b00d10282483
author Evgeny Eltsin <eaeltsin@google.com> Wed Jul 08 18:15:48 2020 +0200
committer Evgeny Eltsin <eaeltsin@google.com> Fri Jul 10 05:47:28 2020 +0000
tree 04dec8b570eccdc1ebb193e6b3b3279371fcd230
parent 3849023eca41b295a6c3b91f686bbf832b2579cf

Stop intercepting clone function

Original function should now work OK with improved clone syscall
emulation.

Bug: 156271630
Test: bionic-unit-tests
Change-Id: I57967f532f0ebb7ba536f3b0e1757800a5231287

overriding/libc/stubs_arm.cpp

diff --git a/overriding/libc/stubs_arm.cpp b/overriding/libc/stubs_arm.cpp
index 82b02e8..1851f1b 100644
--- a/overriding/libc/stubs_arm.cpp
+++ b/overriding/libc/stubs_arm.cpp
@@ -41,7 +41,6 @@
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(android_getaddrinfofornetcontext);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(android_mallopt);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(android_set_abort_message);
-DEFINE_INTERCEPTABLE_STUB_FUNCTION(clone);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(freeaddrinfo);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(gai_strerror);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(getaddrinfo);
@@ -112,7 +111,6 @@
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", android_getaddrinfofornetcontext);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", android_mallopt);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", android_set_abort_message);
-  INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", clone);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", freeaddrinfo);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", gai_strerror);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", getaddrinfo);

overriding/libc/stubs_arm64.cpp

diff --git a/overriding/libc/stubs_arm64.cpp b/overriding/libc/stubs_arm64.cpp
index 82b02e8..1851f1b 100644
--- a/overriding/libc/stubs_arm64.cpp
+++ b/overriding/libc/stubs_arm64.cpp
@@ -41,7 +41,6 @@
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(android_getaddrinfofornetcontext);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(android_mallopt);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(android_set_abort_message);
-DEFINE_INTERCEPTABLE_STUB_FUNCTION(clone);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(freeaddrinfo);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(gai_strerror);
 DEFINE_INTERCEPTABLE_STUB_FUNCTION(getaddrinfo);
@@ -112,7 +111,6 @@
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", android_getaddrinfofornetcontext);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", android_mallopt);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", android_set_abort_message);
-  INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", clone);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", freeaddrinfo);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", gai_strerror);
   INIT_INTERCEPTABLE_STUB_FUNCTION("libc.so", getaddrinfo);