commit 304aa50750add5744904c223c0402506fc7c2259
author android-build-team Robot <android-build-team-robot@google.com> Wed Jun 14 07:29:46 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jun 14 07:29:46 2017 +0000
tree d4aa46ca6b3bfc1df4ac4a9392b9c2070fca5485
parent 451c99c3ae127b047d884b3894fc106ce10a6811
parent 407abedb3bd5285da10d0a6b69705c82c9778dcf

release-request-b1bd0f0e-f3c4-414e-8f22-d9235831ae23-for-git_oc-mr1-release-4099045 snap-temp-L41300000074003051

Change-Id: I1876a90976793add5bbe0dca620aebd4301b7733

src/x86/Ginit.c

diff --git a/src/x86/Ginit.c b/src/x86/Ginit.c
index 4863c15..6748b55 100644
--- a/src/x86/Ginit.c
+++ b/src/x86/Ginit.c
@@ -162,10 +162,13 @@
     }
   else
     {
-      /* validate address */
-      const struct cursor *c = (const struct cursor *)arg;
-      if (c && c->validate && validate_mem(addr))
+      /* ANDROID support update. */
+#ifdef CONSERVATIVE_CHECKS
+      if (validate_mem(addr))
         return -1;
+#endif
+      /* End of ANDROID update. */
+
       /* ANDROID support update. */
 #ifdef UNW_LOCAL_ONLY
       if (map_local_is_readable (addr, sizeof(unw_word_t)))

src/x86_64/Ginit.c

diff --git a/src/x86_64/Ginit.c b/src/x86_64/Ginit.c
index 672b667..60d973b 100644
--- a/src/x86_64/Ginit.c
+++ b/src/x86_64/Ginit.c
@@ -179,11 +179,12 @@
     }
   else
     {
-      /* validate address */
-      const struct cursor *c = (const struct cursor *)arg;
-      if (likely (c != NULL) && unlikely (c->validate)
-          && unlikely (validate_mem (addr)))
+      /* ANDROID support update. */
+#ifdef CONSERVATIVE_CHECKS
+      if (unlikely (validate_mem (addr)))
         return -1;
+#endif
+      /* End of ANDROID update. */
 
       /* ANDROID support update. */
 #ifdef UNW_LOCAL_ONLY