~rootmos/lua-hack

e326bdae21c1879833bf7700317e14520329e531 — Gustav Behm 1 year, 6 months ago 0eec6e3 run
Move Lua helpers to libr
3 files changed, 34 insertions(+), 22 deletions(-)

M run/.k
M run/main.c
M run/r.h
M run/.k => run/.k +1 -1
@@ 7,5 7,5 @@ trace() {
}

libr() {
    "$HOME/git/libr/bundle.sh" -o r.h landlock fail logging util
    "$HOME/git/libr/bundle.sh" -o r.h landlock fail logging util lua
}

M run/main.c => run/main.c +0 -19
@@ 10,16 10,6 @@
#define LIBR_IMPLEMENTATION
#include "r.h"

#define LUA_EXPECT_TYPE(L, t, expected, format, ...) do { \
    if(t != expected) {\
        r_failwith(__extension__ __FUNCTION__, __extension__ __FILE__, \
                   __extension__ __LINE__, 0, \
                   format ": unexpected type %s (expected %s)\n", \
                   ##__VA_ARGS__, lua_typename(L, t), \
                   lua_typename(L, expected)); \
    } \
} while(0)

void seccomp_apply_filter()
{
    struct sock_filter filter[] = {


@@ 31,15 21,6 @@ void seccomp_apply_filter()
    CHECK(r, "prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER)");
}

#ifndef LUA_STACK_NEUTRAL_TERM
#define LUA_STACK_NEUTRAL_TERM __lua_stack_top
#endif

#define lua_stack_neutral_begin(L) int LUA_STACK_NEUTRAL_TERM = lua_gettop(L)
#define lua_stack_neutral_end(L) \
    CHECK_IF(LUA_STACK_NEUTRAL_TERM != lua_gettop(L), \
             "redundant stack elements present")

void remove_stdlib_function(struct lua_State* L,
                            const char* lib, const char* f)
{

M run/r.h => run/r.h +33 -2
@@ 1,5 1,5 @@
// libr (a4ad8cac2c74c0f6064ee64a24efe56e99afd9bc) (https://github.com/rootmos/libr) (2022-10-11T09:00:04+02:00)
// modules: landlock fail logging util
// libr (e64aab8c0ee175883bb2835961259f6e45eb96ec) (https://github.com/rootmos/libr) (2022-10-11T09:26:07+02:00)
// modules: landlock fail logging util lua

#ifndef LIBR_HEADER
#define LIBR_HEADER


@@ 187,6 187,34 @@ const char* now_iso8601(void);
void set_blocking(int fd, int blocking);
void no_new_privs(void);

// libr: lua.h
#define CHECK_LUA(L, err, format, ...) do { \
    if(err != LUA_OK) { \
        r_failwith(__extension__ __FUNCTION__, __extension__ __FILE__, \
                   __extension__ __LINE__, 0, \
                   format ": %s\n", ##__VA_ARGS__, lua_tostring(L, -1)); \
    } \
} while(0)

#define LUA_EXPECT_TYPE(L, t, expected, format, ...) do { \
    if(t != expected) {\
        r_failwith(__extension__ __FUNCTION__, __extension__ __FILE__, \
                   __extension__ __LINE__, 0, \
                   format ": unexpected type %s (expected %s)\n", \
                   ##__VA_ARGS__, lua_typename(L, t), \
                   lua_typename(L, expected)); \
    } \
} while(0)

#ifndef LUA_STACK_NEUTRAL_TERM
#define LUA_STACK_NEUTRAL_TERM __lua_stack_top
#endif

#define lua_stack_neutral_begin(L) int LUA_STACK_NEUTRAL_TERM = lua_gettop(L)
#define lua_stack_neutral_end(L) \
    CHECK_IF(LUA_STACK_NEUTRAL_TERM != lua_gettop(L), \
             "redundant stack elements present")

#endif // LIBR_HEADER
#ifdef LIBR_IMPLEMENTATION



@@ 404,4 432,7 @@ void no_new_privs(void)
    CHECK(r, "prctl(PR_SET_NO_NEW_PRIVS, 1)");
}

// libr: lua.c


#endif // LIBR_IMPLEMENTATION