From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org, Sergey Kaplun <skaplun@tarantool.org>, Maxim Kokryashkin <m.kokryashkin@tarantool.org> Subject: [Tarantool-patches] [PATCH luajit 1/2][v2] FFI: Treat cdata finalizer table as a GC root. Date: Tue, 9 Jul 2024 13:45:48 +0300 [thread overview] Message-ID: <48e2f924db3e2bdac356cefd9aae21e42556514b.1720521873.git.sergeyb@tarantool.org> (raw) In-Reply-To: <cover.1720521873.git.sergeyb@tarantool.org> From: Mike Pall <mike> Thanks to Sergey Bronnikov. (cherry picked from commit dda1ac273ad946387088d91039a8ae319359903d) There is a table `CTState->finalizer` that contains cdata finalizers. This table is created on initialization of the `ffi` module by calling the functions `luaopen_ffi` and `ffi_finalizer`. In some circumstances, this table could be collected by GC and then accessed by the function `lj_gc_finalize_cdata`. This leads to a heap-use-after-free problem. The patch fixes the problem. Sergey Bronnikov: * added the description and the tests for the problem Part of tarantool/tarantool#10199 --- src/lj_gc.c | 3 + ...free-on-access-to-CTState-finalizer.test.c | 66 +++++++++++++++++++ ...ee-on-access-to-CTState-finalizer.test.lua | 18 +++++ 3 files changed, 87 insertions(+) create mode 100644 test/tarantool-c-tests/lj-1168-heap-use-after-free-on-access-to-CTState-finalizer.test.c create mode 100644 test/tarantool-tests/lj-1168-heap-use-after-free-on-access-to-CTState-finalizer.test.lua diff --git a/src/lj_gc.c b/src/lj_gc.c index 591862b3..42348a34 100644 --- a/src/lj_gc.c +++ b/src/lj_gc.c @@ -99,6 +99,9 @@ static void gc_mark_start(global_State *g) gc_markobj(g, tabref(mainthread(g)->env)); gc_marktv(g, &g->registrytv); gc_mark_gcroot(g); +#if LJ_HASFFI + if (ctype_ctsG(g)) gc_markobj(g, ctype_ctsG(g)->finalizer); +#endif g->gc.state = GCSpropagate; } diff --git a/test/tarantool-c-tests/lj-1168-heap-use-after-free-on-access-to-CTState-finalizer.test.c b/test/tarantool-c-tests/lj-1168-heap-use-after-free-on-access-to-CTState-finalizer.test.c new file mode 100644 index 00000000..c388c6a7 --- /dev/null +++ b/test/tarantool-c-tests/lj-1168-heap-use-after-free-on-access-to-CTState-finalizer.test.c @@ -0,0 +1,66 @@ +#include <string.h> + +#include "lua.h" +#include "lauxlib.h" + +#include "test.h" + +/* + * This test demonstrates LuaJIT's incorrect behaviour on + * loading Lua chunk. + * See https://github.com/LuaJIT/LuaJIT/issues/1168 for details. + * + * The GC is driving forward during parsing of the Lua chunk (`chunk`). + * The chunk contains plenty of global objects, and the parsing + * of this creates a lot of strings to be used as keys in `_G`. + * Also, it contains several imaginary numbers (1i, 4i, 8i). + * That leads to the opening of the FFI library on-demand during the + * parsing of these numbers. After the FFI library is open, `ffi.gc` + * has the finalizer table as its environment. But, there is no + * FFI module table anywhere to anchor the `ffi.gc` itself, and + * the `lua_State` object was marked before the function is + * placed on it. Hence, after the atomic phase, the table + * is considered dead and collected. Since the table is collected, + * the usage of its nodes in the `lj_gc_finalize_cdata` leads + * to heap-use-after-free. + */ + +const char buff[] = "return 1LL"; + +/* + * lua_close is a part of testcase, so testcase creates + * it's own Lua state and closes it at the end. + */ +static int unmarked_finalizer_tab_gcstart(void *test_state) +{ + /* Shared Lua state is not needed. */ + (void)test_state; + + /* Setup. */ + lua_State *L = luaL_newstate(); + + /* Set GC at the start. */ + lua_gc(L, LUA_GCCOLLECT, 0); + + if (luaL_loadbufferx(L, buff, sizeof(buff) - 1, "chunk", "t") != LUA_OK) + printf("Err: %s\n", lua_tostring(L, -1)); + + /* Finish GC cycle. */ + while (!lua_gc(L, LUA_GCSTEP, -1)); + + /* Teardown. */ + lua_settop(L, 0); + lua_close(L); + + return TEST_EXIT_SUCCESS; +} + +int main(void) +{ + const struct test_unit tgroup[] = { + test_unit_def(unmarked_finalizer_tab_gcstart), + }; + const int test_result = test_run_group(tgroup, NULL); + + return test_result; +} diff --git a/test/tarantool-tests/lj-1168-heap-use-after-free-on-access-to-CTState-finalizer.test.lua b/test/tarantool-tests/lj-1168-heap-use-after-free-on-access-to-CTState-finalizer.test.lua new file mode 100644 index 00000000..fca5ec76 --- /dev/null +++ b/test/tarantool-tests/lj-1168-heap-use-after-free-on-access-to-CTState-finalizer.test.lua @@ -0,0 +1,18 @@ +local tap = require('tap') + +-- This test demonstrates LuaJIT's heap-use-after-free +-- on collecting garbage. Test simulates "unloading" of the library, +-- or removing some of the functionality of it and then calls +-- `collectgarbage`. +-- See https://github.com/LuaJIT/LuaJIT/issues/1168 for details. +local test = tap.test('lj-1168-heap-use-after-free-on-access-to-CTState-finalizer') +test:plan(1) + +local ffi = require('ffi') + +ffi.gc = nil +collectgarbage() + +test:ok(true, 'no heap use after free') + +test:done(true) -- 2.34.1
next prev parent reply other threads:[~2024-07-09 10:46 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2024-07-09 10:45 [Tarantool-patches] [PATCH luajit 0/2][v2] Fix cdata finalizer table Sergey Bronnikov via Tarantool-patches 2024-07-09 10:45 ` Sergey Bronnikov via Tarantool-patches [this message] 2024-07-09 11:52 ` [Tarantool-patches] [PATCH luajit 1/2][v2] FFI: Treat cdata finalizer table as a GC root Sergey Kaplun via Tarantool-patches 2024-07-09 15:43 ` Sergey Bronnikov via Tarantool-patches 2024-07-10 13:13 ` Sergey Kaplun via Tarantool-patches 2024-07-23 18:18 ` Sergey Bronnikov via Tarantool-patches 2024-08-12 13:32 ` Sergey Kaplun via Tarantool-patches 2024-08-15 7:32 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 8:33 ` Sergey Kaplun via Tarantool-patches 2024-07-09 10:45 ` [Tarantool-patches] [PATCH luajit 2/2][v2] FFI: Turn FFI finalizer table into a proper " Sergey Bronnikov via Tarantool-patches 2024-07-09 12:14 ` Sergey Kaplun via Tarantool-patches 2024-07-10 11:39 ` Sergey Bronnikov via Tarantool-patches 2024-07-10 14:08 ` Sergey Kaplun via Tarantool-patches 2024-07-23 18:29 ` Sergey Bronnikov via Tarantool-patches 2024-08-12 13:17 ` Sergey Kaplun via Tarantool-patches 2024-08-15 7:34 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 8:34 ` Sergey Kaplun via Tarantool-patches 2024-07-09 11:54 ` [Tarantool-patches] [PATCH luajit 0/2][v2] Fix cdata finalizer table Sergey Kaplun via Tarantool-patches 2024-07-10 11:41 ` Sergey Bronnikov via Tarantool-patches 2024-08-15 8:15 Sergey Bronnikov via Tarantool-patches 2024-08-15 8:20 ` [Tarantool-patches] [PATCH luajit 1/2][v2] FFI: Treat cdata finalizer table as a GC root Sergey Bronnikov via Tarantool-patches 2024-08-15 8:59 ` Maxim Kokryashkin via Tarantool-patches
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=48e2f924db3e2bdac356cefd9aae21e42556514b.1720521873.git.sergeyb@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=estetus@gmail.com \ --cc=m.kokryashkin@tarantool.org \ --cc=skaplun@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH luajit 1/2][v2] FFI: Treat cdata finalizer table as a GC root.' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox