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

Merge "Avoid prctl(PR_PAC_RESET_KEYS) on devices without PAC support." am: 2f62c26bcb am: c30eb0ff47

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/1684248

Change-Id: Ib8f8f568ae02438fadfcaf543a387114f67f37b6
This commit is contained in:
Peter Collingbourne 2021-04-22 21:52:49 +00:00 committed by Automerger Merge Worker
commit f412f0892a
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libc/bionic/pthread_create.cpp
View file

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