Skip to content

[CORE] Separate the malloc function for box64 itself and the emulated app #4004

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

Open
zengdage wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −17
Open

[CORE] Separate the malloc function for box64 itself and the emulated app #4004

Show file tree
Hide file tree
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
34 changes: 17 additions & 17 deletions src/mallochook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ uint32_t getProtection(uintptr_t addr);
// mmap history
static int malloc_hack_2 = 0;

#define ALLOC 0
#define ALLOC 1
#define FREE 1

char* box_strdup(const char* s) {
Expand Down Expand Up @@ -258,15 +258,15 @@ char* box32_strdup(const char* s) {
#endif

// redefining all libc memory allocation routines
EXPORT void* malloc(size_t l)
EXPORT void* my1_malloc(size_t l)
{
if(malloc_hack_2 && ALLOC && real_malloc) {
return (void*)RunFunctionFmtNoAlt(real_malloc, "L", l);
}
return actual_calloc(1, l);
}

EXPORT void free(void* p)
EXPORT void my1_free(void* p)
{
if(malloc_hack_2 && p) {
if(getMmapped((uintptr_t)p)) {
Expand All @@ -280,15 +280,15 @@ EXPORT void free(void* p)
actual_free(p);
}

EXPORT void* calloc(size_t n, size_t s)
EXPORT void* my1_calloc(size_t n, size_t s)
{
if(malloc_hack_2 && ALLOC && real_calloc) {
return (void*)RunFunctionFmtNoAlt(real_calloc, "LL", n,s);
}
return actual_calloc(n, s);
}

EXPORT void* realloc(void* p, size_t s)
EXPORT void* my1_realloc(void* p, size_t s)
{
if(malloc_hack_2)
if(getMmapped((uintptr_t)p) || (!p && ALLOC && real_realloc)) {
Expand All @@ -311,7 +311,7 @@ EXPORT void* realloc(void* p, size_t s)
return actual_realloc(p, s);
}

EXPORT void* memalign(size_t align, size_t size)
EXPORT void* my1_memalign(size_t align, size_t size)
{
if(malloc_hack_2 && ALLOC && real_aligned_alloc) {
return (void*)RunFunctionFmtNoAlt(real_aligned_alloc, "LL", align, size);
Expand All @@ -321,7 +321,7 @@ EXPORT void* memalign(size_t align, size_t size)
return actual_memalign(align, size);
}

EXPORT void* aligned_alloc(size_t align, size_t size)
EXPORT void* my1_aligned_alloc(size_t align, size_t size)
{
if(malloc_hack_2 && ALLOC && real_aligned_alloc) {
return (void*)RunFunctionFmtNoAlt(real_aligned_alloc, "LL", align, size);
Expand All @@ -332,7 +332,7 @@ EXPORT void* aligned_alloc(size_t align, size_t size)
return actual_memalign(align, size);
}

EXPORT int posix_memalign(void** p, size_t align, size_t size)
EXPORT int my1_posix_memalign(void** p, size_t align, size_t size)
{
if(malloc_hack_2 && ALLOC && real_posix_memalign) {
return RunFunctionFmtNoAlt(real_posix_memalign, "pLL", p, align, size);
Expand All @@ -348,23 +348,23 @@ EXPORT int posix_memalign(void** p, size_t align, size_t size)
return 0;
}

EXPORT void* valloc(size_t size)
EXPORT void* my1_valloc(size_t size)
{
if(malloc_hack_2 && ALLOC && real_valloc) {
return (void*)RunFunctionFmtNoAlt(real_valloc, "L", size);
}
return actual_memalign(box64_pagesize, size);
}

EXPORT void* pvalloc(size_t size)
EXPORT void* my1_pvalloc(size_t size)
{
if(malloc_hack_2 && ALLOC && real_pvalloc) {
return (void*)RunFunctionFmtNoAlt(real_pvalloc, "L", size);
}
return actual_memalign(box64_pagesize, (size+box64_pagesize-1)&~(box64_pagesize-1));
}

EXPORT void cfree(void* p)
EXPORT void my1_cfree(void* p)
{
if(malloc_hack_2 && p) {
if(getMmapped((uintptr_t)p)) {
Expand All @@ -378,7 +378,7 @@ EXPORT void cfree(void* p)
actual_free(p);
}

EXPORT size_t malloc_usable_size(void* p)
EXPORT size_t my1_malloc_usable_size(void* p)
{
if(malloc_hack_2 && real_malloc_usable_size) {
if(getMmapped((uintptr_t)p))
Expand Down Expand Up @@ -995,12 +995,12 @@ void checkHookedSymbols(elfheader_t* h)
const char * symname = h->StrTab+h->SymTab._64[i].st_name;
uintptr_t offs = h->SymTab._64[i].st_value + h->delta;
size_t sz = h->SymTab._64[i].st_size;
#define GO(A, B) if(!strcmp(symname, "__libc_" #A)) {uintptr_t alt = AddCheckBridge(my_context->system, B, A, 0, #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, "__libc_" #A, h, NULL);}
#define GO(A, B) if(!strcmp(symname, "__libc_" #A)) {uintptr_t alt = AddCheckBridge(my_context->system, B, my1_##A, 0, "my1_" #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, "__libc_" #A, h, NULL);}
#define GO2(A, B)
SUPER()
#undef GO
#undef GO2
#define GO(A, B) if(!strcmp(symname, #A)) {uintptr_t alt = AddCheckBridge(my_context->system, B, A, 0, #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, #A, h, &real_##A);}
#define GO(A, B) if(!strcmp(symname, #A)) {uintptr_t alt = AddCheckBridge(my_context->system, B, my1_##A, 0, "my1_" #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, "my1_" #A, h, &real_##A);}
#define GO2(A, B) if(!strcmp(symname, #A) && (BOX64ENV(malloc_hack)>1)) {uintptr_t alt = AddCheckBridge(my_context->system, B, my_##A, 0, "my_" #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, "my_" #A, h, &real_##A);}
SUPER()
#undef GO
Expand All @@ -1018,12 +1018,12 @@ void checkHookedSymbols(elfheader_t* h)
uintptr_t offs = h->DynSym._64[i].st_value + h->delta;
size_t sz = h->DynSym._64[i].st_size;
if(bind!=STB_LOCAL && bind!=STB_WEAK) {
#define GO(A, B) if(!strcmp(symname, "__libc_" #A)) {uintptr_t alt = AddCheckBridge(my_context->system, B, A, 0, #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, "__libc_" #A, h, NULL);}
#define GO(A, B) if(!strcmp(symname, "__libc_" #A)) {uintptr_t alt = AddCheckBridge(my_context->system, B, my1_##A, 0, "my1_" #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, "__libc_" #A, h, NULL);}
#define GO2(A, B)
SUPER()
#undef GO
#undef GO2
#define GO(A, B) if(!strcmp(symname, #A)) {uintptr_t alt = AddCheckBridge(my_context->system, B, A, 0, #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, #A, h, &real_##A);}
#define GO(A, B) if(!strcmp(symname, #A)) {uintptr_t alt = AddCheckBridge(my_context->system, B, my1_##A, 0, "my1_" #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, "my1_" #A, h, &real_##A);}
#define GO2(A, B) if(!strcmp(symname, #A) && (BOX64ENV(malloc_hack)>1)) {uintptr_t alt = AddCheckBridge(my_context->system, B, my_##A, 0, "my_" #A); printf_log(LOG_DEBUG, "Redirecting %s function from %p (%s)\n", symname, (void*)offs, ElfName(h)); addRelocJmp((void*)offs, (void*)alt, sz, "my_" #A, h, &real_##A);}
SUPER()
#undef GO
Expand All @@ -1048,7 +1048,7 @@ void endMallocHook()
EXPORT int my___TBB_internal_find_original_malloc(int n, char* names[], void* ptr[])
{
int ret = 1;
#define GO(A, B) else if(!strcmp(names[i], #A)) {ptr[i] = A;}
#define GO(A, B) else if(!strcmp(names[i], #A)) {ptr[i] = my1_##A;}
#define GO2(A, B)
for (int i=0; i<n; ++i)
if (0) {}
Expand Down
5 changes: 5 additions & 0 deletions src/wrapped/wrappedlibc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3953,9 +3953,14 @@ void obstackSetup() {
void obstackSetup();
#endif

extern void* my1_calloc(size_t n, size_t s);
EXPORT void* my_malloc(unsigned long size)
{
#if !defined(TERMUX) && !defined(ANDROID) && !defined(STATICBUILD)
return my1_calloc(1, size);
#else
return calloc(1, size);
#endif
}

EXPORT int my_setrlimit(x64emu_t* emu, int ressource, const struct rlimit *rlim)
Expand Down
Loading