Merge branch 'master' into 4.x-releng

This commit is contained in:
Joris Vink 2023-04-15 09:32:40 +02:00
commit aa7e6a1e99
4 changed files with 26 additions and 0 deletions

View File

@ -17,6 +17,8 @@
#include <kore/kore.h>
#include <kore/http.h>
#include <inttypes.h>
int page(struct http_request *);
int

View File

@ -112,6 +112,12 @@ static struct sock_filter filter_acme[] = {
KORE_SYSCALL_ALLOW(clone),
KORE_SYSCALL_ALLOW(membarrier),
KORE_SYSCALL_ALLOW(set_robust_list),
#if defined(SYS_clone3)
KORE_SYSCALL_ALLOW(clone3),
#endif
#if defined(SYS_rseq)
KORE_SYSCALL_ALLOW(rseq),
#endif
};
#endif

View File

@ -30,6 +30,7 @@ static struct sock_filter filter_curl[] = {
KORE_SYSCALL_ALLOW(bind),
KORE_SYSCALL_ALLOW(ioctl),
KORE_SYSCALL_ALLOW(connect),
KORE_SYSCALL_ALLOW(socketpair),
KORE_SYSCALL_ALLOW(getsockopt),
KORE_SYSCALL_ALLOW(getsockname),
KORE_SYSCALL_ALLOW_ARG(socket, 0, AF_INET),
@ -38,6 +39,12 @@ static struct sock_filter filter_curl[] = {
KORE_SYSCALL_ALLOW_ARG(socket, 0, AF_NETLINK),
/* Threading related. */
#if defined(SYS_clone3)
KORE_SYSCALL_ALLOW(clone3),
#endif
#if defined(SYS_rseq)
KORE_SYSCALL_ALLOW(rseq),
#endif
KORE_SYSCALL_ALLOW(clone),
KORE_SYSCALL_ALLOW(set_robust_list),
@ -50,6 +57,11 @@ static struct sock_filter filter_curl[] = {
KORE_SYSCALL_ALLOW(faccessat),
KORE_SYSCALL_ALLOW(newfstatat),
KORE_SYSCALL_ALLOW(getpeername),
#if defined(SYS_getdents64)
KORE_SYSCALL_ALLOW(getdents64),
#endif
};
#endif

View File

@ -33,6 +33,12 @@ static struct sock_filter filter_task[] = {
KORE_SYSCALL_ALLOW(clone),
KORE_SYSCALL_ALLOW(socketpair),
KORE_SYSCALL_ALLOW(set_robust_list),
#if defined(SYS_clone3)
KORE_SYSCALL_ALLOW(clone3),
#endif
#if defined(SYS_rseq)
KORE_SYSCALL_ALLOW(rseq),
#endif
};
#endif