From: Sergey Kaplun via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Maxim Kokryashkin <m.kokryashkin@tarantool.org>,
Sergey Bronnikov <sergeyb@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH luajit 4/6] FFI: Fix dangling reference to CType.
Date: Mon, 23 Oct 2023 12:22:04 +0300 [thread overview]
Message-ID: <b2a4449e7ed71582c36672e85d467df867d695f4.1698049570.git.skaplun@tarantool.org> (raw)
In-Reply-To: <cover.1698049570.git.skaplun@tarantool.org>
From: Mike Pall <mike>
(cherry-picked from commit ae533e3a6c009b5df79b11cd5787d249202fa69c)
During the conversion of a cdata function object to some cdata value in
`lj_cconv_ct_tv()`, reallocation of `cts->tab` in `lj_ctype_intern()`
may occur. In that case, the reference to the `CType` object becomes
invalid. This patch saves the `CTypeID` of the given function and gets
its `CType` again after possible reallocation.
Sergey Kaplun:
* added the description and the test for the problem
Part of tarantool/tarantool#9145
---
src/lj_cconv.c | 2 +
.../fix-dangling-reference-to-ctype.test.lua | 59 +++++++++++++++++++
2 files changed, 61 insertions(+)
create mode 100644 test/tarantool-tests/fix-dangling-reference-to-ctype.test.lua
diff --git a/src/lj_cconv.c b/src/lj_cconv.c
index 37c88852..94ca93bb 100644
--- a/src/lj_cconv.c
+++ b/src/lj_cconv.c
@@ -568,7 +568,9 @@ void lj_cconv_ct_tv(CTState *cts, CType *d,
}
s = ctype_raw(cts, sid);
if (ctype_isfunc(s->info)) {
+ CTypeID did = ctype_typeid(cts, d);
sid = lj_ctype_intern(cts, CTINFO(CT_PTR, CTALIGN_PTR|sid), CTSIZE_PTR);
+ d = ctype_get(cts, did); /* cts->tab may have been reallocated. */
} else {
if (ctype_isenum(s->info)) s = ctype_child(cts, s);
goto doconv;
diff --git a/test/tarantool-tests/fix-dangling-reference-to-ctype.test.lua b/test/tarantool-tests/fix-dangling-reference-to-ctype.test.lua
new file mode 100644
index 00000000..c0e2c07b
--- /dev/null
+++ b/test/tarantool-tests/fix-dangling-reference-to-ctype.test.lua
@@ -0,0 +1,59 @@
+local tap = require('tap')
+local ffi = require('ffi')
+local test = tap.test('fix-dangling-reference-to-ctype'):skipcond({
+ -- luacheck: no global
+ ['Impossible to predict the value of cts->top'] = _TARANTOOL,
+})
+
+test:plan(1)
+
+-- This test demonstrates LuaJIT's incorrect behaviour when the
+-- reallocation of `cts->tab` strikes during the conversion of a
+-- TValue (cdata function pointer) to a C type.
+-- The test fails under ASAN.
+
+-- XXX: Just some C functions to be casted. There is no need to
+-- declare their prototypes correctly.
+ffi.cdef[[
+ int malloc(void);
+ int fprintf(void);
+ int printf(void);
+ int memset(void);
+ int memcpy(void);
+ int memmove(void);
+ int getppid(void);
+]]
+
+-- XXX: structure to set `cts->top` to 110.
+local _ = ffi.new('struct {int a; long b; float c; double d;}', 0)
+
+-- Anchor table to prevent cdata objects from being collected.
+local anchor = {}
+-- Each call to this function grows `cts->top` by 3.
+local function save_new_func(func)
+ anchor[#anchor + 1] = ffi.cast('void (*)(void)', func)
+end
+
+save_new_func(ffi.C.malloc) -- `cts->top` = 110
+save_new_func(ffi.C.fprintf) -- `cts->top` = 113
+save_new_func(ffi.C.printf) -- `cts->top` = 116
+save_new_func(ffi.C.memset) -- `cts->top` = 119
+save_new_func(ffi.C.memcpy) -- `cts->top` = 122
+
+-- Assertions to check the `cts->top` value and step between
+-- calls.
+assert(ffi.typeinfo(122), 'cts->top >= 122')
+assert(not ffi.typeinfo(123), 'cts->top < 123')
+
+save_new_func(ffi.C.memmove) -- `cts->top` = 125
+
+assert(ffi.typeinfo(125), 'cts->top >= 125')
+assert(not ffi.typeinfo(126), 'cts->top < 126')
+
+-- Last call to grow `cts->top` up to 128, so this causes
+-- `cts->tab` reallocation.
+save_new_func(ffi.C.getppid) -- `cts->top` = 128
+
+test:ok(true, 'no heap-use-after-free in lj_cconv_ct_tv')
+
+test:done(true)
--
2.42.0
next prev parent reply other threads:[~2023-10-23 9:28 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-23 9:22 [Tarantool-patches] [PATCH luajit 0/6] FFI fixes Sergey Kaplun via Tarantool-patches
2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 1/6] Abstract out on-demand loading of FFI library Sergey Kaplun via Tarantool-patches
2023-10-24 14:38 ` Maxim Kokryashkin via Tarantool-patches
2023-11-29 14:35 ` Sergey Bronnikov via Tarantool-patches
2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 2/6] FFI: Fix missing cts->L initialization in argv2ctype() Sergey Kaplun via Tarantool-patches
2023-10-24 14:49 ` Maxim Kokryashkin via Tarantool-patches
2023-10-25 10:19 ` Sergey Kaplun via Tarantool-patches
2023-11-29 14:39 ` Sergey Bronnikov via Tarantool-patches
2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 3/6] FFI: Ensure returned string is alive in ffi.typeinfo() Sergey Kaplun via Tarantool-patches
2023-10-24 21:33 ` Maxim Kokryashkin via Tarantool-patches
2023-11-29 14:48 ` Sergey Bronnikov via Tarantool-patches
2023-10-23 9:22 ` Sergey Kaplun via Tarantool-patches [this message]
2023-10-25 7:48 ` [Tarantool-patches] [PATCH luajit 4/6] FFI: Fix dangling reference to CType Maxim Kokryashkin via Tarantool-patches
2023-10-25 10:43 ` Sergey Kaplun via Tarantool-patches
2023-10-25 11:42 ` Maxim Kokryashkin via Tarantool-patches
2023-10-25 8:06 ` Maxim Kokryashkin via Tarantool-patches
2023-11-29 15:00 ` Sergey Bronnikov via Tarantool-patches
2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 5/6] FFI: Fix dangling reference to CType. Improve checks Sergey Kaplun via Tarantool-patches
2023-10-25 8:05 ` Maxim Kokryashkin via Tarantool-patches
2023-10-25 10:46 ` Sergey Kaplun via Tarantool-patches
2023-10-25 11:42 ` Maxim Kokryashkin via Tarantool-patches
2023-11-29 15:41 ` Sergey Bronnikov via Tarantool-patches
2023-11-30 7:25 ` Sergey Kaplun via Tarantool-patches
2023-12-19 10:55 ` Sergey Bronnikov via Tarantool-patches
2023-10-23 9:22 ` [Tarantool-patches] [PATCH luajit 6/6] FFI: Fix dangling reference to CType in carith_checkarg() Sergey Kaplun via Tarantool-patches
2023-10-25 8:07 ` Maxim Kokryashkin via Tarantool-patches
2023-10-25 10:48 ` Sergey Kaplun via Tarantool-patches
2023-10-25 11:42 ` Maxim Kokryashkin via Tarantool-patches
2023-12-19 10:59 ` Sergey Bronnikov via Tarantool-patches
2023-12-19 11:01 ` [Tarantool-patches] [PATCH luajit 0/6] FFI fixes Sergey Bronnikov via Tarantool-patches
2024-01-10 8:53 ` Igor Munkin 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=b2a4449e7ed71582c36672e85d467df867d695f4.1698049570.git.skaplun@tarantool.org \
--to=tarantool-patches@dev.tarantool.org \
--cc=m.kokryashkin@tarantool.org \
--cc=sergeyb@tarantool.org \
--cc=skaplun@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH luajit 4/6] FFI: Fix dangling reference to CType.' \
/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