Skip to content

Commit

Permalink
Avoid conflict between 64 bit lightuserdata and ITERN key.
Browse files Browse the repository at this point in the history
Reported by XmiliaH.

(cherry picked from commit 16d38a4)

This patch fixes the regression introduced in scope of
fa8e7ffefb715abf55dc5b0c708c63251868 ('Add support for full-range
64 bit lightuserdata.').

The maximum available number of lightuserdata segment is 255. So the
high bits of this lightuserdata TValue are 0xfffe7fff. The same high
bits are set for special control variable on the stack for ITERN/ITERC
bytecodes via ISNEXT bytecode. When ITERN bytecode is despecialize to
ITERC bytecode and a table has the lightuserdata with the maximum
available segment number as a key, the special control variable is
considered as this key and iteration is broken.

This patch forbids to use more than 254 lightuserdata segments to
avoid clashing with the aforementioned control variable. In case when
user tries to create lightuserdata with 255th segment number an error
"bad light userdata pointer" is raised.

Sergey Kaplun:
* added the description and the test for the problem

Part of tarantool/tarantool#5629
  • Loading branch information
Mike Pall authored and Buristan committed Sep 8, 2021
1 parent 369e050 commit 4d1caa0
Show file tree
Hide file tree
Showing 5 changed files with 114 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/lj_udata.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,10 @@ void *lj_lightud_intern(lua_State *L, void *p)
if (segmap[seg] == up) /* Fast path. */
return (void *)(((uint64_t)seg << LJ_LIGHTUD_BITS_LO) | lightudlo(u));
segnum++;
/* Leave last segment unused to avoid clash with ITERN key. */
if (segnum >= (1 << LJ_LIGHTUD_BITS_SEG)-1) lj_err_msg(L, LJ_ERR_BADLU);
}
if (!((segnum-1) & segnum) && segnum != 1) {
if (segnum >= (1 << LJ_LIGHTUD_BITS_SEG)) lj_err_msg(L, LJ_ERR_BADLU);
lj_mem_reallocvec(L, segmap, segnum, segnum ? 2*segnum : 2u, uint32_t);
setmref(g->gc.lightudseg, segmap);
}
Expand Down
1 change: 1 addition & 0 deletions test/tarantool-tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ add_subdirectory(gh-4427-ffi-sandwich)
add_subdirectory(gh-6098-fix-side-exit-patching-on-arm64)
add_subdirectory(gh-6189-cur_L)
add_subdirectory(lj-49-bad-lightuserdata)
add_subdirectory(lj-727-lightuserdata-itern)
add_subdirectory(lj-flush-on-trace)
add_subdirectory(misclib-getmetrics-capi)

Expand Down
48 changes: 48 additions & 0 deletions test/tarantool-tests/lj-727-lightuserdata-itern.test.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
local tap = require('tap')

-- Test file to demonstrate next FF incorrect behaviour on LJ_64.
-- See also, https://github.com/LuaJIT/LuaJIT/issues/727.

local test = tap.test('lj-727-lightuserdata-itern')
test:plan(1)

local ud = require('lightuserdata').craft_ptr_wp()

-- We now have the tagged lightuuserdata pointer
-- 0xFFFE7FFF00000002 in the up before this patch (after the patch
-- the maximum available lightuserdata segment is 0xffe).

-- These pointers are special in for loop keys as they are used in
-- the INTERN control variable to denote the current index in the
-- array.
-- If the ITERN is then patched to ITERC because of
-- despecialization via the ISNEXT bytecode, the control variable
-- is considered as the existing key in the table and some
-- elements are skipped during iteration.

local real_next = next
local next = next

local function itern_test(t, f)
for k, v in next, t do
f(k, v)
end
end

local visited = {}
local t = {1, [ud] = 2345}
itern_test(t, function(k, v)
visited[k] = v
if next == real_next then
next = function(tab, key)
return real_next(tab, key)
end
-- Despecialize bytecode.
itern_test({}, function() end)
end
end)

test.strict = true
test:is_deeply(visited, t, 'userdata node is visited')

os.exit(test:check() and 0 or 1)
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
BuildTestCLib(lightuserdata lightuserdata.c)
62 changes: 62 additions & 0 deletions test/tarantool-tests/lj-727-lightuserdata-itern/lightuserdata.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
#include <lua.h>
#include <lauxlib.h>

#undef NDEBUG
#include <assert.h>

/* To stay within 47 bits, lightuserdata is segmented. */
#define LJ_LIGHTUD_BITS_SEG 8
#define NSEGMENTS ((1 << LJ_LIGHTUD_BITS_SEG)-1)

/*
* The function to wrap: get a number to form lightuserdata to
* return with the 0xXXXXXfff00000002 format.
* It may raise an error, when the available lightuserdata
* segments are run out.
*/
static int craft_ptr(lua_State *L)
{
const unsigned long long i = lua_tonumber(L, 1);
lua_pushlightuserdata(L, (void *)((i << 44) + 0xfff00000002));
return 1;
}

/*
* The function to generate bunch of lightuserdata of the
* 0xXXXXXfff00000002 format and push the last one on the stack.
*/
static int craft_ptr_wp(lua_State *L)
{
void *ptr = NULL;
/*
* There are only 255 available lightuserdata segments.
* Generate a bunch of pointers to take them all.
* XXX: After this patch the last userdata segment is
* reserved for ISNEXT/ITERC/ITERN control variable, so
* `craft_ptr()` function will raise an error at the last
* iteration.
*/
for (unsigned long long i = 0; i < NSEGMENTS; i++) {
lua_pushcfunction(L, craft_ptr);
lua_pushnumber(L, i);
if (lua_pcall(L, 1, 1, 0) == LUA_OK)
ptr = (void *)lua_topointer(L, -1);
else
break;
}
assert(ptr != NULL);
/* Overwrite possible error message. */
lua_pushlightuserdata(L, ptr);
return 1;
}

static const struct luaL_Reg lightuserdata[] = {
{"craft_ptr_wp", craft_ptr_wp},
{NULL, NULL}
};

LUA_API int luaopen_lightuserdata(lua_State *L)
{
luaL_register(L, "lightuserdata", lightuserdata);
return 1;
}

0 comments on commit 4d1caa0

Please sign in to comment.