[Tarantool-patches] [PATCH luajit] ARM64: Fix pcall() error case.

Igor Munkin imun at tarantool.org
Thu Mar 30 20:38:51 MSK 2023


Sergey,

I've checked the patchset into all long-term branches in
tarantool/luajit and bumped a new version in master, 2.11 and 2.10.

On 10.02.23, Sergey Kaplun via Tarantool-patches wrote:
> From: Mike Pall <mike>
> 
> Reported by Alex Orlenko.
> 
> (cherry picked from commit b4b2dce9fc3ffaaaede39b36d06415311e2aa516)
> 
> The `pcall()` assembler preambule modifies `RC` (`x28`) (N args * 8)
> during the check of the amount of the given arguments. So, this wrong
> value using in the `fff_fallback` routine leading to a crash on the
> error throwing, because the Lua stack is filled incorrect and can't be
> unwound.
> 
> This patch adds the additional comparison before taking the fallback
> branch and modifies `RC` only after this branch.
> 
> Sergey Kaplun:
> * added the description and the test for the problem
> 
> Part of tarantool/tarantool#8069
> ---
> 
> PR: https://github.com/tarantool/tarantool/pull/8295
> Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-762-arm64-pcall-no-arg
> Issues:
> * https://github.com/tarantool/tarantool/issues/8069
> * https://github.com/LuaJIT/LuaJIT/issues/762
> 
>  src/vm_arm64.dasc                                 |  3 ++-
>  test/tarantool-tests/lj-762-pcall-no-arg.test.lua | 15 +++++++++++++++
>  2 files changed, 17 insertions(+), 1 deletion(-)
>  create mode 100644 test/tarantool-tests/lj-762-pcall-no-arg.test.lua
> 

<snipped>

> -- 
> 2.34.1
> 

-- 
Best regards,
IM


More information about the Tarantool-patches mailing list