From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 12113A5A5DC; Thu, 15 Feb 2024 16:58:19 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 12113A5A5DC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1708005499; bh=hgM91Hkc9Cb1art0W1BlwSaJycfA11yBVL9yU3y3jX4=; h=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=LHrwuL4R/bP/AoylD8OnQ1qGlE8vvUDUkVduekNZsH5QymXhv/6J3n2emo2wLl/71 iI+IY8u3QVMD0+vxbnYjebGVwaCW/2zHR4rTmJ9AA/Pbwv9x6oD9nvoJwOodL/jY/z biOLa3tEpnjFqfmUHy7DEIYCb1/Q7bo2Ydktg+Qo= Received: from smtp52.i.mail.ru (smtp52.i.mail.ru [95.163.41.88]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 747B5A5A5D8 for ; Thu, 15 Feb 2024 16:58:17 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 747B5A5A5D8 Received: by smtp52.i.mail.ru with esmtpa (envelope-from ) id 1racFj-0000000HS9t-2ezK; Thu, 15 Feb 2024 16:58:16 +0300 Date: Thu, 15 Feb 2024 13:46:49 +0000 To: Sergey Kaplun Message-ID: References: <20240131121859.18071-1-skaplun@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20240131121859.18071-1-skaplun@tarantool.org> X-Clacks-Overhead: GNU Terry Pratchett X-Mailru-Src: smtp X-4EC0790: 10 X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD9001F8F2F6BAD2021A9C1F32554F77B3470762C4BF7D77BE000894C459B0CD1B9803E417DF4CE0384E8C069F77790D3CAB2406E0BDC6D4EFE406B99327490C5600C43EDF95CA0F6DD X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE71BDE6A359BD5B800EA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637B100969577675F2D8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8A33BC7E985AA61880F58EA55EEAB2904B000524E4656CED5CC7F00164DA146DAFE8445B8C89999728AA50765F79006372A3B24BF85B2E607389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8A9FF340AA05FB58CF6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947CF8BD4E506CFA3D882D242C3BD2E3F4C64AD6D5ED66289B523666184CF4C3C14F6136E347CC761E07725E5C173C3A84C3856009BA58C5E1BBBA3038C0950A5D36B5C8C57E37DE458B330BD67F2E7D9AF16D1867E19FE14079C09775C1D3CA48CFED8438A78DFE0A9E1DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C30584FF81F342DA0735872C767BF85DA2F004C90652538430E4A6367B16DE6309 X-C1DE0DAB: 0D63561A33F958A5904BFAA432F3E5075002B1117B3ED6966CAAD5599A5E4200AD0703CEB2EF9A27823CB91A9FED034534781492E4B8EEADB05233B9BC4759D3 X-C8649E89: 1C3962B70DF3F0ADE00A9FD3E00BEEDF3FED46C3ACD6F73ED3581295AF09D3DF87807E0823442EA2ED31085941D9CD0AF7F820E7B07EA4CF722BCAB5AD86B92BB317F2240C84F3A442DFD27231A17117EF348DEF4BCAEF4C9EC5AF04A575AA6C3168784816B256840D2104F2730CF7E2C864A64DD904967607CE3E69985037ACC226CC413062362A913E6812662D5F2A74A26541E23E71317A83BD0C44CE203720ABEDE4BBDD9CDD X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojQ9gr3ZFpXEn/NwdjHQqWuA== X-Mailru-Sender: 2FEBA92C8E508479FE7B9A1DF348D5316605F424246C54460841F56765D88C40A09146A5EFBDCAAC03F7D97C3DBAA82AF5EE5212A79745119D086FC03DADA47A24EDF3BD9585A06DEEABBE9EE6587A054198E0F3ECE9B5443453F38A29522196 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH luajit] Fix unsinking of IR_FSTORE for NULL metatable. X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Igor Munkin via Tarantool-patches Reply-To: Igor Munkin Cc: tarantool-patches@dev.tarantool.org Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Sergey, I've checked the patchset into all long-term branches in tarantool/luajit and bumped a new version in master, release/3.0 and release/2.11. On 31.01.24, Sergey Kaplun via Tarantool-patches wrote: > From: Mike Pall > > Reported by pwnhacker0x18. > > (cherry picked from commit 85b4fed0b0353dd78c8c875c2f562d522a2b310f) > > The `FSTORE` restoring of a sunk table from a snapshot for > `IRFL_TAB_META` misses the case when the second argument of > `setmetatable()` is `nil` (so, the `FSTORE` second operand is `NULL`). > This may lead to the corresponding assertion failure in the > `snap_replay_const()` or the crash. > > This patch handles the aforementioned case. > > Sergey Kaplun: > * added the description and the test for the problem > > Part of tarantool/tarantool#9595 > --- > > Branch: https://github.com/tarantool/luajit/tree/skaplun/lj-1147-fstore-null-meta > Tarantool PR: https://github.com/tarantool/tarantool/pull/9635 > Related issues: > * https://github.com/tarantool/tarantool/issues/9595 > * https://github.com/LuaJIT/LuaJIT/issues/1147 > > src/lj_snap.c | 11 +++-- > .../lj-1147-fstore-null-meta.test.lua | 41 +++++++++++++++++++ > 2 files changed, 49 insertions(+), 3 deletions(-) > create mode 100644 test/tarantool-tests/lj-1147-fstore-null-meta.test.lua > > -- > 2.43.0 > -- Best regards, IM