sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/sim/src/sim/up_macho_init.c: Add a workaround for Monterey

Browse Source
This commit is contained in:
YAMAMOTO Takashi 2022-01-19 12:23:29 +09:00 committed by Xiang Xiao
parent 2763f67640
commit f0acf8e62a
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/sim/src/sim/up_macho_init.c
View File

@ -22,8 +22,11 @@
* Included Files * Included Files
****************************************************************************/ ****************************************************************************/
#include <sys/mman.h>
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h>
/**************************************************************************** /****************************************************************************
* Private Data * Private Data
@ -49,6 +52,24 @@ static const char **g_saved_argv;
static const char **g_saved_envp; static const char **g_saved_envp;
static const char **g_saved_apple; static const char **g_saved_apple;
static void
allow_write(const void *start, const void *end)
{
const size_t page_size = sysconf(_SC_PAGE_SIZE);
const size_t page_mask = ~(page_size - 1);
void *p = (void *)((uintptr_t)start & page_mask);
size_t sz = ((uintptr_t)end - (uintptr_t)p + page_size - 1) & ~page_mask;
/* It seems that Monterey (12.1) maps the section read-only.
* Make it writable as we want to patch it.
* This was not necessary for Mojave.
* Ignore failures as this might not be critical, depending on
* the OS version.
*/
(void)mprotect(p, sz, PROT_READ | PROT_WRITE);
}
__attribute__((constructor)) __attribute__((constructor))
static void save_and_replace_init_funcs(int argc, const char *argv[], static void save_and_replace_init_funcs(int argc, const char *argv[],
const char *envp[], const char *envp[],
@ -64,6 +85,7 @@ static void save_and_replace_init_funcs(int argc, const char *argv[],
g_num_saved_init_funcs = nfuncs - 1; g_num_saved_init_funcs = nfuncs - 1;
g_saved_init_funcs = malloc(g_num_saved_init_funcs * g_saved_init_funcs = malloc(g_num_saved_init_funcs *
sizeof(*g_saved_init_funcs)); sizeof(*g_saved_init_funcs));
allow_write(&mod_init_func_start, &mod_init_func_end);
int i = 0; int i = 0;
for (fp = &mod_init_func_start; fp < &mod_init_func_end; fp++) for (fp = &mod_init_func_start; fp < &mod_init_func_end; fp++)
{ {