summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2012-10-05 11:17:21 -0700
committerNick Kralevich <nnk@google.com>2012-10-05 12:02:46 -0700
commit01b1dee0ab7ad649760f9d8a7cead2a3f6d9cf70 (patch)
treef16401bc0163f872b0c78477427c44e2dd44a555
parentd6d478058fc201bfc70f353019477e17c71a29d4 (diff)
downloadcore-01b1dee0ab7ad649760f9d8a7cead2a3f6d9cf70.tar.gz
init: Set ADDR_COMPAT_LAYOUT before spawning processes.
Some Android programs have problems with memory which grows from the top down. Temporarily set ADDR_COMPAT_LAYOUT to avoid breaking those programs. Bug: 7188322 Change-Id: I61760500e670b4563838c63b82d4a0b6e354a86e
-rwxr-xr-xinit/init.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/init/init.c b/init/init.c
index 6127fd38e..1c80d9cc4 100755
--- a/init/init.c
+++ b/init/init.c
@@ -31,6 +31,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/un.h>
+#include <sys/personality.h>
#ifdef HAVE_SELINUX
#include <selinux/selinux.h>
@@ -242,6 +243,21 @@ void service_start(struct service *svc, const char *dynamic_args)
int fd, sz;
umask(077);
+#ifdef __arm__
+ /*
+ * b/7188322 - Temporarily revert to the compat memory layout
+ * to avoid breaking third party apps.
+ *
+ * THIS WILL GO AWAY IN A FUTURE ANDROID RELEASE.
+ *
+ * http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=7dbaa466
+ * changes the kernel mapping from bottom up to top-down.
+ * This breaks some programs which improperly embed
+ * an out of date copy of Android's linker.
+ */
+ int current = personality(0xffffFFFF);
+ personality(current | ADDR_COMPAT_LAYOUT);
+#endif
if (properties_inited()) {
get_property_workspace(&fd, &sz);
sprintf(tmp, "%d,%d", dup(fd), sz);