Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[GWP-ASan] Enable recoverable GWP-ASan for apps." am: 2fb37134a1

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2428075

Change-Id: I61a205dcb06134e9d698e218cbdf487fea434566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mitch Phillips
2023-02-14 18:59:41 +00:00
committed by Automerger Merge Worker
parent 93158a6d6d 2fb37134a1
commit d2fc8c6097
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/jni/com_android_internal_os_Zygote.cpp
View File

@@ -1929,15 +1929,16 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids,
const char* nice_name_ptr = nice_name.has_value() ? nice_name.value().c_str() : nullptr;
android_mallopt_gwp_asan_options_t gwp_asan_options;
const char* kGwpAsanAppRecoverableSysprop =
"persist.device_config.memory_safety_native.gwp_asan_recoverable_apps";
// The system server doesn't have its nice name set by the time SpecializeCommon is called.
gwp_asan_options.program_name = nice_name_ptr ?: process_name;
switch (runtime_flags & RuntimeFlags::GWP_ASAN_LEVEL_MASK) {
default:
case RuntimeFlags::GWP_ASAN_LEVEL_DEFAULT:
// TODO(b/247012630): Switch this to Action::TURN_ON_FOR_APP_SAMPLED_NON_CRASHING once
// performance and syshealth testing is completed, making the default for non-system
// apps that don't specify a `gwpAsanMode` in their manifest to be sampled-recoverable.
gwp_asan_options.desire = Action::DONT_TURN_ON_UNLESS_OVERRIDDEN;
gwp_asan_options.desire = GetBoolProperty(kGwpAsanAppRecoverableSysprop, true)
? Action::TURN_ON_FOR_APP_SAMPLED_NON_CRASHING
: Action::DONT_TURN_ON_UNLESS_OVERRIDDEN;
android_mallopt(M_INITIALIZE_GWP_ASAN, &gwp_asan_options, sizeof(gwp_asan_options));
break;
case RuntimeFlags::GWP_ASAN_LEVEL_NEVER: