tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "[MemInit] Remove process_disable_memory_mitigations" am: 701dfe7469

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I93f30b198a483c6467f33adf046b5f885b4f382d
This commit is contained in:
Mitch Phillips 2021-02-02 00:04:59 +00:00 committed by Automerger Merge Worker
commit 244a9df3d7
3 changed files with 0 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libcutils/Android.bp
View file

@ -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",

3
libcutils/include/cutils/memory.h
View file

@ -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

38
libcutils/memory.cpp
View file

@ -1,38 +0,0 @@
/*
* 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.");
}
}