commit 9cde5054d9db5ee5942d35c0758bbee1106115cd
author Elliott Hughes <enh@google.com> Wed May 02 17:36:47 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 02 17:36:47 2012 -0700
tree 97c0d3b041620e61056f26d91cd1ccee64818ef5
parent 763330669f7e420d01f544fbd91e1fb0a9399b9d
parent 51e5386d207785316431be6719b3f128bc4048c0

Merge "Port 311886c6c6fcd3b531531f592d56caab5e2a259c to art." into dalvik-dev

src/native/dalvik_system_Zygote.cc

diff --git a/src/native/dalvik_system_Zygote.cc b/src/native/dalvik_system_Zygote.cc
index b4f69fb..cdc4c29 100644
--- a/src/native/dalvik_system_Zygote.cc
+++ b/src/native/dalvik_system_Zygote.cc
@@ -18,6 +18,7 @@
 #include <paths.h>
 #include <signal.h>
 #include <stdlib.h>
+#include <sys/personality.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -316,6 +317,13 @@
       PLOG(FATAL) << "setuid(" << uid << ") failed";
     }
 
+    // Work around ARM kernel ASLR lossage (http://b/5817320).
+    int old_personality = personality(0xffffffff);
+    int new_personality = personality(old_personality | ADDR_NO_RANDOMIZE);
+    if (new_personality == -1) {
+      PLOG(WARNING) << "personality(" << new_personality << ") failed";
+    }
+
     SetCapabilities(permittedCapabilities, effectiveCapabilities);
 
 #if 1