From: Sergey Bronnikov via Tarantool-patches <tarantool-patches@dev.tarantool.org>
To: Sergey Kaplun <skaplun@tarantool.org>,
Maxim Kokryashkin <m.kokryashkin@tarantool.org>
Cc: tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH luajit] FFI: Fix various issues in recff_cdata_arith.
Date: Tue, 10 Sep 2024 13:04:06 +0300 [thread overview]
Message-ID: <b09ad71b-5a4b-403f-9a48-872d098582cb@tarantool.org> (raw)
In-Reply-To: <5f51a9ad-3302-4e0c-8d91-c5a26c147fe2@tarantool.org>
[-- Attachment #1: Type: text/plain, Size: 2489 bytes --]
Hi, Sergey,
On 09.09.2024 18:37, Sergey Bronnikov via Tarantool-patches wrote:
>
> Hi, Sergey,
>
> thanks for the patch! see my comments below.
>
> On 21.08.2024 19:52, Sergey Kaplun wrote:
>> From: Mike Pall <mike>
>>
>> Thanks to Sergey Kaplun.
>>
>> (cherry picked from commit 7a608e4425ce0777f5c980dad9f4fdc1bcce0b8c)
>>
>> The aforementioned function doesn't handle gentle recording of the cdata
>> addition to `nil` or some string, presuming that the interpreter will throw
>> an error. This may lead to an assertion due to an uninitialized ctype
>> state or an attempt to use in the fold engine the non-cdata summand (casted
>> to `IR_KPTR`) as the (invalid) GC pointer.
>>
>> This patch handles such cases by:
>> * Initializing the ctype state where it is needed.
>> * Raising an error when the argument has a suspicious type. Since the
>> interpreter will throw the error anyway, these traces will abort
>> anyway.
>>
>> Sergey Kaplun:
>> * added the description and the test for the problem
>>
>> Part of tarantool/tarantool#10199
>> ---
>>
>> Branch:https://github.com/tarantool/luajit/tree/skaplun/lj-1224-fix-jit-cdata-arith
>> Related issues:
>> *https://github.com/tarantool/tarantool/issues/10199
>> *https://github.com/LuaJIT/LuaJIT/issues/1224
>>
>> src/lj_crecord.c | 10 ++--
>> .../lj-1224-fix-cdata-arith-ptr.test.lua | 48 +++++++++++++++++++
>
> This test does not fail without fix (but repro from the issue does):
>
> [0] ~/sources/MRG/tarantool/third_party/luajit $
> ./build/gc64/src/luajit -Ohotloop=1 -e "
> repeat
> r = 1LL + nil
> until true
> "
> LuaJIT ASSERT
> /home/sergeyb/sources/MRG/tarantool/third_party/luajit/src/lj_ctype.c:185:
> lj_ctype_intern: uninitialized cts->L
> Aborted
> [0] ~/sources/MRG/tarantool/third_party/luajit $
> ./build/gc64/src/luajit
> test/tarantool-tests/lj-1224-fix-cdata-arith-ptr.test.lua
> TAP version 13
> 1..2
> # cdata arithmetic with nil
> 1..2
> ok - correct recording error with bad cdata arithmetic
> ok - correct error message
> # cdata arithmetic with nil: end
> ok - cdata arithmetic with nil
> # cdata arithmetic with string
> 1..2
> ok - correct recording error with bad cdata arithmetic
> ok - correct error message
> # cdata arithmetic with string: end
> ok - cdata arithmetic with string
> [0] ~/sources/MRG/tarantool/third_party/luajit $
>
With GC64 only (LUAJIT_ENABLE_GC64).
<snipped>
[-- Attachment #2: Type: text/html, Size: 5300 bytes --]
next prev parent reply other threads:[~2024-09-10 10:04 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-21 16:52 Sergey Kaplun via Tarantool-patches
2024-09-09 15:37 ` Sergey Bronnikov via Tarantool-patches
2024-09-10 10:04 ` Sergey Bronnikov via Tarantool-patches [this message]
2024-09-10 14:01 ` Sergey Kaplun via Tarantool-patches
2024-09-12 10:16 ` Sergey Kaplun via Tarantool-patches
2024-09-12 11:45 ` Sergey Bronnikov via Tarantool-patches
2024-09-23 7:21 ` 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=b09ad71b-5a4b-403f-9a48-872d098582cb@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] FFI: Fix various issues in recff_cdata_arith.' \
/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