mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-09 12:52:30 +00:00
181519cf38
11b3a0c2c5db115412c37195#explicit zero 1131456ac632#brk 1158ebc243ea#random 115323b39f7e#undefined 116a91d9dddb#merge 11a042b5a0ba#vla formatting 119ec639de1b#pthread 1149571a0a49#read only 11149cc5ccb8#zero 112e613ccbe7#fork mmap 11e239c7dff8#memprot pthread 110b03d92b7f#xor 11de08419b82#junk 11897d4903e2#guard 11648cd68ca3#ptrhread guard 110bc4dbcbd2#stack rand 10aa9cc05d0710a8cdbb6352#explicit zero 10b28302c668#brk 109f8be7d07c#random 10cb91a7ee3a#undefined 1008279e2fdd#merge 106a18bd565d#vla formatting 102f392c2d08#pthread 108bbce1bc50#read only 10725f61db82#zero 104cd257135f#fork mmap 109220cf622b#memprot pthread 108ef71d1ffd#memprot exit 100eaef1abbd#xor 1064f1cc2148#junk 105c42a527cf#guard 105cc8c34e60#pthread guard 107f61cc8a1c#stack rand 9abdf523d269e4b9b31e6f#explicit zero 9a3a22a63d2#brk 97444dbc3cf#random 9dcd3b72ac9#undefined 9543e1df342#merge 9611e5691f7#vla formatting 98de97ce864#pthread 9a475717042#read only 97f0947cc0e#zero 9e9751d3370#fork mmap 983cd86d0d5#memprot pthread 91ebb165455#memprot exit 9488ba483cf#xor 9f9351d884b#junk 985e5bca0a5#move Signed-off-by: Tad <tad@spotco.us>
58 lines
3.0 KiB
Diff
58 lines
3.0 KiB
Diff
From 5cc8c34e60dbfeb1fd996bf83bb01a0443d93a8a Mon Sep 17 00:00:00 2001
|
|
From: Daniel Micay <danielmicay@gmail.com>
|
|
Date: Thu, 10 Oct 2019 22:52:49 -0400
|
|
Subject: [PATCH] move pthread_internal_t behind guard page
|
|
|
|
---
|
|
libc/bionic/pthread_create.cpp | 19 +++++++++----------
|
|
1 file changed, 9 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/libc/bionic/pthread_create.cpp b/libc/bionic/pthread_create.cpp
|
|
index 6bbf970a0b..b4a044db18 100644
|
|
--- a/libc/bionic/pthread_create.cpp
|
|
+++ b/libc/bionic/pthread_create.cpp
|
|
@@ -218,10 +218,13 @@ int __init_thread(pthread_internal_t* thread) {
|
|
ThreadMapping __allocate_thread_mapping(size_t stack_size, size_t stack_guard_size) {
|
|
const StaticTlsLayout& layout = __libc_shared_globals()->static_tls_layout;
|
|
|
|
- // Allocate in order: stack guard, stack, guard page, static TLS, guard page.
|
|
+ size_t thread_page_size = __BIONIC_ALIGN(sizeof(pthread_internal_t), PAGE_SIZE);
|
|
+
|
|
+ // Allocate in order: stack guard, stack, guard page, pthread_internal_t, static TLS, guard page.
|
|
size_t mmap_size;
|
|
if (__builtin_add_overflow(stack_size, stack_guard_size, &mmap_size)) return {};
|
|
if (__builtin_add_overflow(mmap_size, PTHREAD_GUARD_SIZE, &mmap_size)) return {};
|
|
+ if (__builtin_add_overflow(mmap_size, thread_page_size, &mmap_size)) return {};
|
|
if (__builtin_add_overflow(mmap_size, layout.size(), &mmap_size)) return {};
|
|
if (__builtin_add_overflow(mmap_size, PTHREAD_GUARD_SIZE, &mmap_size)) return {};
|
|
|
|
@@ -250,9 +253,10 @@ ThreadMapping __allocate_thread_mapping(size_t stack_size, size_t stack_guard_si
|
|
return {};
|
|
}
|
|
|
|
- char* const static_tls_space = space + stack_guard_size + stack_size + PTHREAD_GUARD_SIZE;
|
|
+ char* const thread = space + stack_guard_size + stack_size + PTHREAD_GUARD_SIZE;
|
|
+ char* const static_tls_space = thread + thread_page_size;
|
|
|
|
- if (mprotect(static_tls_space, layout.size(), PROT_READ | PROT_WRITE) != 0) {
|
|
+ if (mprotect(thread, thread_page_size + layout.size(), PROT_READ | PROT_WRITE) != 0) {
|
|
async_safe_format_log(ANDROID_LOG_WARN, "libc",
|
|
"pthread_create failed: couldn't mprotect R+W %zu-byte static TLS mapping region: %s",
|
|
layout.size(), strerror(errno));
|
|
@@ -295,13 +299,8 @@ static int __allocate_thread(pthread_attr_t* attr, bionic_tcb** tcbp, void** chi
|
|
stack_top = static_cast<char*>(attr->stack_base) + attr->stack_size;
|
|
}
|
|
|
|
- // Carve out space from the stack for the thread's pthread_internal_t. This
|
|
- // memory isn't counted in pthread_attr_getstacksize.
|
|
-
|
|
- // To safely access the pthread_internal_t and thread stack, we need to find a 16-byte aligned boundary.
|
|
- stack_top = align_down(stack_top - sizeof(pthread_internal_t), 16);
|
|
-
|
|
- pthread_internal_t* thread = reinterpret_cast<pthread_internal_t*>(stack_top);
|
|
+ pthread_internal_t* thread = reinterpret_cast<pthread_internal_t*>(
|
|
+ mapping.static_tls - __BIONIC_ALIGN(sizeof(pthread_internal_t), PAGE_SIZE));
|
|
if (!stack_clean) {
|
|
// If thread was not allocated by mmap(), it may not have been cleared to zero.
|
|
// So assume the worst and zero it.
|