Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SELinux compatibility: memalign -> mmap

Browse Source
This commit is contained in:
WPMGPRoSToTeMa
2016-01-01 05:12:55 +03:00
parent 866339eff6
commit 48d7a04c73
7 changed files with 33 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
amxmodx/modules.cpp
View File

@ -300,10 +300,10 @@ int load_amxscript(AMX *amx, void **program, const char *filename, char error[64
#elif defined(__GNUC__)
# if defined(__APPLE__)
amx->base = (unsigned char *)valloc(amx->code_size);
mprotect((void *)amx->base, amx->code_size, PROT_READ | PROT_WRITE | PROT_EXEC);
# else
amx->base = (unsigned char *)memalign(sysconf(_SC_PAGESIZE), amx->code_size);
amx->base = (unsigned char *)mmap(nullptr, amx->code_size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
# endif
mprotect((void *)amx->base, amx->code_size, PROT_READ|PROT_WRITE|PROT_EXEC);
#endif
if (amx->base)
memcpy(amx->base, np, amx->code_size);
@ -562,6 +562,7 @@ int unload_amxscript(AMX* amx, void** program)
{
#if defined JIT
int flags = amx->flags;
long code_size = amx->code_size;
#endif
Debugger *pDebugger = (Debugger *)amx->userdata[UD_DEBUGGER];
@ -592,12 +593,16 @@ int unload_amxscript(AMX* amx, void** program)
{
delete [] prg;
} else {
#ifdef __linux__
munmap(prg, code_size);
#else
#ifdef free
#undef free
free(prg);
#define free(ptr) m_deallocator(__FILE__, __LINE__, __FUNCTION__, m_alloc_free, ptr)
#else
free(prg);
#endif
#endif
}
#elif defined WIN32

8
amxmodx/natives.cpp
View File

@ -468,10 +468,10 @@ static cell AMX_NATIVE_CALL register_native(AMX *amx, cell *params)
#elif defined(__GNUC__)
# if defined(__APPLE__)
pNative->pfn = (char *)valloc(size+10);
mprotect((void *)pNative->pfn, size + 10, PROT_READ | PROT_WRITE | PROT_EXEC);
# else
pNative->pfn = (char *)memalign(sysconf(_SC_PAGESIZE), size+10);
pNative->pfn = (char *)mmap(nullptr, size + 10, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
# endif
mprotect((void *)pNative->pfn, size+10, PROT_READ|PROT_WRITE|PROT_EXEC);
#endif
int id = (int)g_RegNatives.length();
@ -492,7 +492,11 @@ void ClearPluginLibraries()
ClearLibraries(LibSource_Plugin);
for (size_t i=0; i<g_RegNatives.length(); i++)
{
#ifdef __linux__
munmap(g_RegNatives[i]->pfn, amxx_DynaCodesize() + 10);
#else
delete [] g_RegNatives[i]->pfn;
#endif
delete g_RegNatives[i];
}
g_RegNatives.clear();