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

Commit 04659925 authored by Mitch Phillips's avatar Mitch Phillips Committed by Automerger Merge Worker
Browse files

Merge "[GWP-ASan] Use new GWP-ASan android_mallopt()" am: a50c4137 am:... 

Merge "[GWP-ASan] Use new GWP-ASan android_mallopt()" am: a50c4137 am: 65b39e8f am: a94d0a79 am: ecaeb5a1

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



Change-Id: I3a9fe77c7d242bcebbc27f8b9ed7acda9d8cf025
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2781ea7e ecaeb5a1

core/jni/com_android_internal_os_Zygote.cpp

+14 −5
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ using android::base::GetBoolProperty; 


using android::zygote::ZygoteFailure;



using Action = android_mallopt_gwp_asan_options_t::Action;



// This type is duplicated in fd_utils.h

typedef const std::function<void(std::string)>& fail_fn_t;
@@ -1717,16 +1719,24 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, 
    // runtime.

    runtime_flags &= ~RuntimeFlags::NATIVE_HEAP_ZERO_INIT_ENABLED;



    bool forceEnableGwpAsan = false;

    const char* nice_name_ptr = nice_name.has_value() ? nice_name.value().c_str() : nullptr;

    android_mallopt_gwp_asan_options_t gwp_asan_options;

    // 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_NEVER:

            gwp_asan_options.desire = 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_ALWAYS:

            forceEnableGwpAsan = true;

            [[fallthrough]];

            gwp_asan_options.desire = Action::TURN_ON_FOR_APP;

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

            break;

        case RuntimeFlags::GWP_ASAN_LEVEL_LOTTERY:

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

            gwp_asan_options.desire = Action::TURN_ON_WITH_SAMPLING;

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

            break;

    }

    // Now that we've used the flag, clear it so that we don't pass unknown flags to the ART

    // runtime.
@@ -1739,7 +1749,6 @@ static void SpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray gids, 
    AStatsSocket_close();



    const char* se_info_ptr = se_info.has_value() ? se_info.value().c_str() : nullptr;

    const char* nice_name_ptr = nice_name.has_value() ? nice_name.value().c_str() : nullptr;



    if (selinux_android_setcontext(uid, is_system_server, se_info_ptr, nice_name_ptr) == -1) {

        fail_fn(CREATE_ERROR("selinux_android_setcontext(%d, %d, \"%s\", \"%s\") failed", uid,