Unverified Commit b0dd25c7 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Add conditional descriptors for newer syscalls/flags

parent 0086eaa6

include/client/syscalls/args.hpp

+8 −2
Original line number Diff line number Diff line
@@ -359,8 +359,12 @@ format_mmap_flags_arg_to(FmtBuffer& buffer, 
            FLAG_ENTRY(MAP_POPULATE),

            FLAG_ENTRY(MAP_NONBLOCK),

            FLAG_ENTRY(MAP_STACK),

            FLAG_ENTRY(MAP_HUGETLB),

            FLAG_ENTRY(MAP_SYNC));

            FLAG_ENTRY(MAP_HUGETLB)

#ifdef MAP_SYNC

            ,

            FLAG_ENTRY(MAP_SYNC)

#endif

            );



    fmt::format_to(buffer, "{}=", parg.name);

    format_flag_set(buffer, parg.value, flag_names);
@@ -397,7 +401,9 @@ format_clone_flags_arg_to(FmtBuffer& buffer, 
            FLAG_ENTRY(CLONE_DETACHED),

            FLAG_ENTRY(CLONE_UNTRACED),

            FLAG_ENTRY(CLONE_CHILD_SETTID),

#ifdef CLONE_NEWCGROUP

            FLAG_ENTRY(CLONE_NEWCGROUP),

#endif

            FLAG_ENTRY(CLONE_NEWUTS),

            FLAG_ENTRY(CLONE_NEWIPC),

            FLAG_ENTRY(CLONE_NEWUSER),

src/client/intercept.cpp

+2 −0
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ int hook(long syscall_number, 
                                reinterpret_cast<const char* const*>(arg2));

            break;



#ifdef SYS_execveat

        case SYS_execveat:

            *result = syscall_no_intercept(syscall_number,

                                arg0,
@@ -360,6 +361,7 @@ int hook(long syscall_number, 
                                reinterpret_cast<const char* const*>(arg3),

                                arg4);

            break;

#endif



        case SYS_open:

            *result = hook_openat(AT_FDCWD,