diff options
| author | Peter Collingbourne <pcc@google.com> | 2021-04-22 22:13:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 22:13:29 +0000 |
| commit | 9771fbf1b88d1bd70c6058c57961d59db0ebc415 (patch) | |
| tree | 3573dc99a4c1af33707cc450e01266f7e06940d4 | |
| parent | 40db2eb3bf5d7d15299b1765a0f766004fc5cb92 (diff) | |
| parent | f412f0892aa421c739b27a4df881533a243e6efb (diff) | |
| download | bionic-9771fbf1b88d1bd70c6058c57961d59db0ebc415.tar.gz | |
Merge "Avoid prctl(PR_PAC_RESET_KEYS) on devices without PAC support." am: 2f62c26bcb am: c30eb0ff47 am: f412f0892a
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1684248
Change-Id: I28e541b4d776f1f9e2617d98df2e133d32e54c84
| -rw-r--r-- | libc/bionic/pthread_create.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp index f3fee8805..46d9e8672 100644 --- a/libc/bionic/pthread_create.cpp +++ b/libc/bionic/pthread_create.cpp @@ -30,6 +30,7 @@ #include <errno.h> #include <string.h> +#include <sys/auxv.h> #include <sys/mman.h> #include <sys/prctl.h> #include <sys/random.h> @@ -346,7 +347,11 @@ static int __pthread_start(void* arg) { __rt_sigprocmask(SIG_SETMASK, &thread->start_mask, nullptr, sizeof(thread->start_mask)); #ifdef __aarch64__ // Chrome's sandbox prevents this prctl, so only reset IA if the target SDK level is high enough. - if (android_get_application_target_sdk_version() >= __ANDROID_API_S__) { + // Furthermore, processes loaded from vendor partitions may have their own sandboxes that would + // reject the prctl. Because no devices launched with PAC enabled before S, we can avoid issues on + // upgrading devices by checking for PAC support before issuing the prctl. + static const bool pac_supported = getauxval(AT_HWCAP) & HWCAP_PACA; + if (pac_supported && android_get_application_target_sdk_version() >= __ANDROID_API_S__) { prctl(PR_PAC_RESET_KEYS, PR_PAC_APIAKEY, 0, 0, 0); } #endif |