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

Commit 39115765 authored by Mitch Phillips's avatar Mitch Phillips
Browse files

[MemInit] Remove process_disable_memory_mitigations 

This function is no longer necessary, and uses a deprecated API
(mallopt(M_BIONIC_DISABLE_MEMORY_MITIGATIONS)). This function was
provided originally as part of libcutils because the original API was a
private android_mallopt.

The API is being reborn as a memory-init-specific mallopt. Given that
regular system components and apps will be able to call it directly,
it's not necessary to have a wrapper function in libcutils any more.

Bug: 135772972
Test: Build the device.
Change-Id: I4a3185b99702c8e445de6837b154c4a96c8295a1
parent 79f7e3f1

libcutils/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ cc_library { 
        "canned_fs_config.cpp",

        "iosched_policy.cpp",

        "load_file.cpp",

        "memory.cpp",

        "native_handle.cpp",

        "properties.cpp",

        "record_stream.cpp",

libcutils/include/cutils/memory.h

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ extern "C" { 
size_t strlcpy(char *dst, const char *src, size_t size);

#endif



// Disables memory mitigations for the entire process, and logs appropriately.

void process_disable_memory_mitigations();



#ifdef __cplusplus

} // extern "C"

#endif

libcutils/memory.cpp

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <cutils/memory.h>



#include <log/log.h>



#if !defined(__APPLE__)

#include <malloc.h>

#endif



void process_disable_memory_mitigations() {

    bool success = false;

#ifdef __BIONIC__

    success = mallopt(M_BIONIC_DISABLE_MEMORY_MITIGATIONS, 0);

#endif



    // TODO: if b/158870657 is fixed and scudo is used globally,

    // we can assert on failure rather than just log.

    if (success) {

        ALOGI("Disabled memory mitigations for process.");

    } else {

        ALOGE("Could not disable memory mitigations for process.");

    }

}