Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1300af5b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update android_mallopt for GWP-ASan with the new names." into main am:... 

Merge "Update android_mallopt for GWP-ASan with the new names." into main am: 52ae2b91 am: 07a3c1a2

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



Change-Id: Ica9568ef5f3acf6e7e0ddf634b3643670f76b9fb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c827f6af 07a3c1a2

core/jni/com_android_internal_os_Zygote.cpp

+7 −7
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ using android::base::GetBoolProperty; 


using android::zygote::ZygoteFailure;



using Action = android_mallopt_gwp_asan_options_t::Action;

using Mode = android_mallopt_gwp_asan_options_t::Mode;



// This type is duplicated in fd_utils.h

typedef const std::function<void(std::string)>& fail_fn_t;
@@ -2101,21 +2101,21 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, 
    switch (runtime_flags & RuntimeFlags::GWP_ASAN_LEVEL_MASK) {

        default:

        case RuntimeFlags::GWP_ASAN_LEVEL_DEFAULT:

            gwp_asan_options.desire = GetBoolProperty(kGwpAsanAppRecoverableSysprop, true)

                    ? Action::TURN_ON_FOR_APP_SAMPLED_NON_CRASHING

                    : Action::DONT_TURN_ON_UNLESS_OVERRIDDEN;

            gwp_asan_options.mode = GetBoolProperty(kGwpAsanAppRecoverableSysprop, true)

                    ? Mode::APP_MANIFEST_DEFAULT

                    : Mode::APP_MANIFEST_NEVER;

            android_mallopt(M_INITIALIZE_GWP_ASAN, &gwp_asan_options, sizeof(gwp_asan_options));

            break;

        case RuntimeFlags::GWP_ASAN_LEVEL_NEVER:

            gwp_asan_options.desire = Action::DONT_TURN_ON_UNLESS_OVERRIDDEN;

            gwp_asan_options.mode = Mode::APP_MANIFEST_NEVER;

            android_mallopt(M_INITIALIZE_GWP_ASAN, &gwp_asan_options, sizeof(gwp_asan_options));

            break;

        case RuntimeFlags::GWP_ASAN_LEVEL_ALWAYS:

            gwp_asan_options.desire = Action::TURN_ON_FOR_APP;

            gwp_asan_options.mode = Mode::APP_MANIFEST_ALWAYS;

            android_mallopt(M_INITIALIZE_GWP_ASAN, &gwp_asan_options, sizeof(gwp_asan_options));

            break;

        case RuntimeFlags::GWP_ASAN_LEVEL_LOTTERY:

            gwp_asan_options.desire = Action::TURN_ON_WITH_SAMPLING;

            gwp_asan_options.mode = Mode::APP_MANIFEST_DEFAULT;

            android_mallopt(M_INITIALIZE_GWP_ASAN, &gwp_asan_options, sizeof(gwp_asan_options));

            break;

    }