Update Art 5.1.1 stack guard patch
Backport of https://android-review.googlesource.com/#/c/427061/.
R=ricow@google.com
Bug: 63151667
Change-Id: I19372dccea9b925b78f4899e2ad1f50f3b27eb73
diff --git a/tools/linux/README.art-versions b/tools/linux/README.art-versions
index ed0fa3b..f347fe2 100644
--- a/tools/linux/README.art-versions
+++ b/tools/linux/README.art-versions
@@ -34,7 +34,7 @@
mkdir 7.0.0_r21
cd 7.0.0_r21
repo init -u https://android.googlesource.com/platform/manifest -b android-7.0.0_r21
- repo sync
+ repo sync -cq -j24
source build/envsetup.sh
lunch aosp_angler-userdebug
m -j24
@@ -105,7 +105,7 @@
mkdir 6.0.1_r66
cd 6.0.1_r66
repo init -u https://android.googlesource.com/platform/manifest -b android-6.0.1_r66
- repo sync
+ repo sync -cq -j24
source build/envsetup.sh
lunch aosp_angler-userdebug
cd art
@@ -121,14 +121,72 @@
art-5.1.1
---------
-Build from branch 5.1.1_r19.
+Build from branch 5.1.1_r19 with the following patch:
+
+diff --git a/runtime/thread.cc b/runtime/thread.cc
+index 2f474f7ae..f927ad7a3 100644
+--- a/runtime/thread.cc
++++ b/runtime/thread.cc
+@@ -257,20 +257,39 @@ void Thread::InstallImplicitProtection() {
+ byte* stack_top = reinterpret_cast<byte*>(reinterpret_cast<uintptr_t>(&stack_himem) &
+ ~(kPageSize - 1)); // Page containing current top of stack.
+
++ //
++ // Accesses too far below the current machine register corresponding to the stack pointer (e.g.,
++ // ESP on x86[-32], SP on ARM) might cause a SIGSEGV (at least on x86 with newer kernels). We
++ // thus have to move the stack pointer. We do this portably by using a recursive function with a
++ // large stack frame size.
++
+ // First remove the protection on the protected region as will want to read and
+ // write it. This may fail (on the first attempt when the stack is not mapped)
+ // but we ignore that.
+ UnprotectStack();
+
+- // Map in the stack. This must be done by reading from the
+- // current stack pointer downwards as the stack may be mapped using VM_GROWSDOWN
+- // in the kernel. Any access more than a page below the current SP might cause
+- // a segv.
+-
+- // Read every page from the high address to the low.
+- for (byte* p = stack_top; p >= pregion; p -= kPageSize) {
+- dont_optimize_this = *p;
+- }
++#define NO_INLINE __attribute__ ((noinline))
++#define ATTRIBUTE_UNUSED __attribute__((__unused__))
++ struct RecurseDownStack {
++ // This function has an intentionally large stack size.
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Wframe-larger-than="
++ NO_INLINE
++ static void Touch(uintptr_t target) {
++ volatile size_t zero = 0;
++ // Use a large local volatile array to ensure a large frame size. Do not use anything close
++ // to a full page for ASAN. It would be nice to ensure the frame size is at most a page, but
++ // there is no pragma support for this.
++ volatile char space[kPageSize - 256];
++ char sink ATTRIBUTE_UNUSED = space[zero];
++ if (reinterpret_cast<uintptr_t>(space) >= target + kPageSize) {
++ Touch(target);
++ }
++ zero *= 2; // Try to avoid tail recursion.
++ }
++#pragma GCC diagnostic pop
++ };
++ RecurseDownStack::Touch(reinterpret_cast<uintptr_t>(pregion));
+
+ VLOG(threads) << "installing stack protected region at " << std::hex <<
+ static_cast<void*>(pregion) << " to " <<
+
mkdir 5.1.1_r19
cd 5.1.1_r19
repo init -u https://android.googlesource.com/platform/manifest -b android-5.1.1_r19
- repo sync
+ repo sync -cq -j24
source build/envsetup.sh
lunch aosp_mako-userdebug
+ cd art
+ <apply patch>
+ cd ..
m -j24
m -j24 build-art
m -j24 test-art-host
diff --git a/tools/linux/art-5.1.1.tar.gz.sha1 b/tools/linux/art-5.1.1.tar.gz.sha1
index 86fef95..2b6f07a 100644
--- a/tools/linux/art-5.1.1.tar.gz.sha1
+++ b/tools/linux/art-5.1.1.tar.gz.sha1
@@ -1 +1 @@
-f19d1c9b77d34a1294301eeb9ef0f31c7cabae17
\ No newline at end of file
+737072daed9a7cd4ef046b7ea8a60aa7b1b6c65d
\ No newline at end of file
