gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-04-19 21:43:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

no ffi anymore

Browse Source
This commit is contained in:
Thibaud Labat 2024-06-26 19:57:47 +02:00
parent d1f507e7d2
commit ebe96a9ec6
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/clear_globals.lua
View File

@ -13,7 +13,7 @@ end
WHITELIST = {"_G", "WHITELIST", "clearAllGlobals", "print", "k", WHITELIST = {"_G", "WHITELIST", "clearAllGlobals", "print", "k",
"v", "pairs", "table_contains", "string", "table", "v", "pairs", "table_contains", "string", "table",
"tonumber", "tostring", "type", "f"} "tonumber", "tostring", "type"}
function clear.clearAllGlobals() function clear.clearAllGlobals()
for k, v in pairs(_G) do for k, v in pairs(_G) do
@ -25,6 +25,8 @@ function clear.clearAllGlobals()
_G["clearAllGlobals"] = nil _G["clearAllGlobals"] = nil
_G["found"] = nil _G["found"] = nil
_G["table_contains"] = nil _G["table_contains"] = nil
_G["pairs"] = nil
_G["_G"] = nil
end end
jit.off(table_contains) jit.off(table_contains)
jit.off(clear.clearAllGlobals) jit.off(clear.clearAllGlobals)

40
src/luajit.c
View File

@ -505,15 +505,12 @@ static struct Smain {
const char *lua = "local ffi = require(\"ffi\")\n" const char *lua_init_script = "local clear = require(\"clear_globals\")\n"
"ffi.cdef[[\n"
"int call_c_function(int);\n"
"]]\n"
"f = ffi.C.call_c_function\n"
"local clear = require(\"clear_globals\")\n"
"-- clear.printAllGlobals()\n" "-- clear.printAllGlobals()\n"
"clear.clearAllGlobals()\n"; "clear.clearAllGlobals()\n";
int call_c_function(lua_State *L);
static int pmain(lua_State *L) static int pmain(lua_State *L)
{ {
struct Smain *s = &smain; struct Smain *s = &smain;
@ -558,10 +555,13 @@ static int pmain(lua_State *L)
if (s->status != LUA_OK) return 0; if (s->status != LUA_OK) return 0;
} }
if (luaL_dostring(L, lua)) { if (luaL_dostring(L, lua_init_script)) {
printf("err: %s\n", lua_tostring(L, -1)); printf("err: %s\n", lua_tostring(L, -1));
} }
lua_pushcfunction(L, call_c_function);
lua_setglobal(L, "call_c_function");
if ((flags & FLAGS_INTERACTIVE)) { if ((flags & FLAGS_INTERACTIVE)) {
print_jit_status(L); print_jit_status(L);
dotty(L); dotty(L);
@ -684,33 +684,44 @@ int check_safe_func(void* ptr){
return !(v2<0||(0<v1 && v1<31415926)||(ptr == &random_digit || ptr==&do_something || ptr==&get_time)); return !(v2<0||(0<v1 && v1<31415926)||(ptr == &random_digit || ptr==&do_something || ptr==&get_time));
} }
extern int call_c_function(int n)
int call_c_function(lua_State *L)
{ {
int n = luaL_checkinteger(L, 1);
int (*func) (void) = global.c_functions[n]; int (*func) (void) = global.c_functions[n];
int retval;
// should not happen but we never know // should not happen but we never know
if(((size_t)&global.c_functions[n] & ~0xfff) != (((size_t)&global) & ~0xfff)) if(((size_t)&global.c_functions[n] & ~0xfff) != (((size_t)&global) & ~0xfff))
{ {
printf("[DEBUG] Unaligned call.\n"); printf("[DEBUG] Unaligned call.\n");
return -1; retval = -1;
} }
if (n>=C_FUNCTIONS_N){ if (n>=C_FUNCTIONS_N){
printf("[DEBUG] Out of bounds call at index %d\n",n); printf("[DEBUG] Out of bounds call at index %d\n",n);
return -2; retval = -2;
} }
else if(func==0){ else if(func==0){
printf("[DEBUG] Null function pointer at index %d\n",n); printf("[DEBUG] Null function pointer at index %d\n",n);
return -3; retval = -3;
} }
else if(check_safe_func(func)) { else if(check_safe_func(func)) {
printf("[DEBUG] Unsafe function call.\n"); printf("[DEBUG] Unsafe function call.\n");
return -4; retval = -4;
} }
else{ else{
printf("[DEBUG] Calling C function at address %p\n",func); printf("[DEBUG] Calling C function at address %p\n",func);
return func(); retval = func();
} }
lua_pushinteger(L, retval);
return 1;
} }
char flag[0x40] = {0}; char flag[0x40] = {0};
@ -735,8 +746,6 @@ int main(int argc, char **argv)
return EXIT_FAILURE; return EXIT_FAILURE;
} }
smain.argc = argc; smain.argc = argc;
smain.argv = argv; smain.argv = argv;
@ -744,6 +753,7 @@ int main(int argc, char **argv)
fflush(stdout); fflush(stdout);
init_seccomp(); init_seccomp();
status = lua_cpcall(L, pmain, NULL); status = lua_cpcall(L, pmain, NULL);
report(L, status); report(L, status);
lua_close(L); lua_close(L);