Merge "[MTE] add sysprop to set mte state globally"
This commit is contained in:
commit
2be3e92943
1 changed files with 4 additions and 2 deletions
|
@ -237,6 +237,7 @@ static unsigned __get_memtag_note(const ElfW(Phdr)* phdr_start, size_t phdr_ct,
|
||||||
// level into *level.
|
// level into *level.
|
||||||
static bool get_environment_memtag_setting(HeapTaggingLevel* level) {
|
static bool get_environment_memtag_setting(HeapTaggingLevel* level) {
|
||||||
static const char kMemtagPrognameSyspropPrefix[] = "arm64.memtag.process.";
|
static const char kMemtagPrognameSyspropPrefix[] = "arm64.memtag.process.";
|
||||||
|
static const char kMemtagGlobalSysprop[] = "persist.arm64.memtag.default";
|
||||||
|
|
||||||
const char* progname = __libc_shared_globals()->init_progname;
|
const char* progname = __libc_shared_globals()->init_progname;
|
||||||
if (progname == nullptr) return false;
|
if (progname == nullptr) return false;
|
||||||
|
@ -250,9 +251,10 @@ static bool get_environment_memtag_setting(HeapTaggingLevel* level) {
|
||||||
|
|
||||||
async_safe_format_buffer(sysprop_name, sysprop_size, "%s%s", kMemtagPrognameSyspropPrefix,
|
async_safe_format_buffer(sysprop_name, sysprop_size, "%s%s", kMemtagPrognameSyspropPrefix,
|
||||||
basename);
|
basename);
|
||||||
|
const char* sys_prop_names[] = {sysprop_name, kMemtagGlobalSysprop};
|
||||||
|
|
||||||
if (!get_config_from_env_or_sysprops("MEMTAG_OPTIONS", &sysprop_name,
|
if (!get_config_from_env_or_sysprops("MEMTAG_OPTIONS", sys_prop_names, arraysize(sys_prop_names),
|
||||||
/* sys_prop_names_size */ 1, options_str, kOptionsSize)) {
|
options_str, kOptionsSize)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue