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

Merge "Reset PAC keys on thread creation instead of on zygote fork." am: 2b9719e361

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

Change-Id: I21f9909d64753b2316c39c9ecb8518b1c118fab7
This commit is contained in:
Peter Collingbourne 2021-04-06 23:28:06 +00:00 committed by Automerger Merge Worker
commit d8b7066e65
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libc/bionic/pthread_create.cpp
View file

@ -344,6 +344,12 @@ static int __pthread_start(void* arg) {
__set_stack_and_tls_vma_name(false); __set_stack_and_tls_vma_name(false);
__init_additional_stacks(thread); __init_additional_stacks(thread);
__rt_sigprocmask(SIG_SETMASK, &thread->start_mask, nullptr, sizeof(thread->start_mask)); __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__) {
prctl(PR_PAC_RESET_KEYS, PR_PAC_APIAKEY, 0, 0, 0);
}
#endif
void* result = thread->start_routine(thread->start_routine_arg); void* result = thread->start_routine(thread->start_routine_arg);
pthread_exit(result); pthread_exit(result);