Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[runtime] Disable stack guard for main thread on osx #10899

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luhenry merged 1 commit into from
Oct 1, 2018
Merged

[runtime] Disable stack guard for main thread on osx #10899

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 22 additions & 8 deletions mono/mini/mini-exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2732,6 +2732,15 @@ mono_setup_altstack (MonoJitTlsData *tls)
size_t stsize = 0;
stack_t sa;
guint8 *staddr = NULL;
#ifdef TARGET_OSX
/*
* On macOS Mojave we are encountering a bug when changing mapping for main thread
* stack pages. Stack overflow on main thread will kill the app.
*/
gboolean disable_stack_guard = pthread_main_np ();
#else
gboolean disable_stack_guard = FALSE;
#endif

if (mono_running_on_valgrind ())
return;
Expand All @@ -2745,16 +2754,18 @@ mono_setup_altstack (MonoJitTlsData *tls)

/*g_print ("thread %p, stack_base: %p, stack_size: %d\n", (gpointer)pthread_self (), staddr, stsize);*/

tls->stack_ovf_guard_base = staddr + mono_pagesize ();
tls->stack_ovf_guard_size = ALIGN_TO (8 * 4096, mono_pagesize ());
if (!disable_stack_guard) {
tls->stack_ovf_guard_base = staddr + mono_pagesize ();
tls->stack_ovf_guard_size = ALIGN_TO (8 * 4096, mono_pagesize ());

g_assert ((guint8*)&sa >= (guint8*)tls->stack_ovf_guard_base + tls->stack_ovf_guard_size);
g_assert ((guint8*)&sa >= (guint8*)tls->stack_ovf_guard_base + tls->stack_ovf_guard_size);

if (mono_mprotect (tls->stack_ovf_guard_base, tls->stack_ovf_guard_size, MONO_MMAP_NONE)) {
/* mprotect can fail for the main thread stack */
gpointer gaddr = mono_valloc (tls->stack_ovf_guard_base, tls->stack_ovf_guard_size, MONO_MMAP_NONE|MONO_MMAP_PRIVATE|MONO_MMAP_ANON|MONO_MMAP_FIXED, MONO_MEM_ACCOUNT_EXCEPTIONS);
g_assert (gaddr == tls->stack_ovf_guard_base);
tls->stack_ovf_valloced = TRUE;
if (mono_mprotect (tls->stack_ovf_guard_base, tls->stack_ovf_guard_size, MONO_MMAP_NONE)) {
/* mprotect can fail for the main thread stack */
gpointer gaddr = mono_valloc (tls->stack_ovf_guard_base, tls->stack_ovf_guard_size, MONO_MMAP_NONE|MONO_MMAP_PRIVATE|MONO_MMAP_ANON|MONO_MMAP_FIXED, MONO_MEM_ACCOUNT_EXCEPTIONS);
g_assert (gaddr == tls->stack_ovf_guard_base);
tls->stack_ovf_valloced = TRUE;
}
}

/* Setup an alternate signal stack */
Expand Down Expand Up @@ -2785,6 +2796,9 @@ mono_free_altstack (MonoJitTlsData *tls)

if (tls->signal_stack)
mono_vfree (tls->signal_stack, MONO_ARCH_SIGNAL_STACK_SIZE, MONO_MEM_ACCOUNT_EXCEPTIONS);

if (!tls->stack_ovf_guard_base)
return;
if (tls->stack_ovf_valloced)
mono_vfree (tls->stack_ovf_guard_base, tls->stack_ovf_guard_size, MONO_MEM_ACCOUNT_EXCEPTIONS);
else
Expand Down