Merge "Merge "Clean MTE and GWP-ASan runtime flags after use." into rvc-dev... (3a9f3ce2) · Commits · e / os / android_frameworks_base

core/jni/com_android_internal_os_Zygote.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -1787,6 +1787,8 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
		heap_tagging_level = M_HEAP_TAGGING_LEVEL_NONE;
		}
		android_mallopt(M_SET_HEAP_TAGGING_LEVEL, &heap_tagging_level, sizeof(heap_tagging_level));
		// Now that we've used the flag, clear it so that we don't pass unknown flags to the ART runtime.
		runtime_flags &= ~RuntimeFlags::MEMORY_TAG_LEVEL_MASK;

		bool forceEnableGwpAsan = false;
		switch (runtime_flags & RuntimeFlags::GWP_ASAN_LEVEL_MASK) {
		@@ -1799,6 +1801,8 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
		case RuntimeFlags::GWP_ASAN_LEVEL_LOTTERY:
		android_mallopt(M_INITIALIZE_GWP_ASAN, &forceEnableGwpAsan, sizeof(forceEnableGwpAsan));
		}
		// Now that we've used the flag, clear it so that we don't pass unknown flags to the ART runtime.
		runtime_flags &= ~RuntimeFlags::GWP_ASAN_LEVEL_MASK;

		if (NeedsNoRandomizeWorkaround()) {
		// Work around ARM kernel ASLR lossage (http://b/5817320).