From b1ae874394ebc1ef041e566ca1d20578b5e6f38e Mon Sep 17 00:00:00 2001 From: Paul Pan Date: Sun, 9 Oct 2022 20:19:25 +0800 Subject: [PATCH] feat: sync language name with runner --- library.c | 2 +- rules/lang.h | 2 +- rules/{lang_c.c => lang_c_cpp.c} | 16 ++++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) rename rules/{lang_c.c => lang_c_cpp.c} (75%) diff --git a/library.c b/library.c index 60ee0c6..53b84e9 100644 --- a/library.c +++ b/library.c @@ -16,7 +16,7 @@ static __attribute__((constructor)) void inject(void) { LOG_INFO("Setting up sandbox for %s(%d)", comm, getpid()); - register_lang_c(); + register_lang_c_cpp(); setup_rlimit(); setup_seccomp(); } diff --git a/rules/lang.h b/rules/lang.h index c6f6bd7..7210c46 100644 --- a/rules/lang.h +++ b/rules/lang.h @@ -1,6 +1,6 @@ #ifndef WOJ_SANDBOX_LANG_H #define WOJ_SANDBOX_LANG_H -void register_lang_c(void); +void register_lang_c_cpp(void); #endif // WOJ_SANDBOX_LANG_H diff --git a/rules/lang_c.c b/rules/lang_c_cpp.c similarity index 75% rename from rules/lang_c.c rename to rules/lang_c_cpp.c index e38e1a5..7c3a701 100644 --- a/rules/lang_c.c +++ b/rules/lang_c_cpp.c @@ -4,7 +4,7 @@ #include -void setup_lang_c(scmp_filter_ctx ctx) { +void setup_lang_c_cpp(scmp_filter_ctx ctx) { int white[] = { SCMP_SYS(read), // 0 SCMP_SYS(write), // 1 @@ -29,8 +29,16 @@ void setup_lang_c(scmp_filter_ctx ctx) { } struct rule lang_c_rule = { - .name = "lang_c", - .setup = setup_lang_c, + .name = "c", + .setup = setup_lang_c_cpp, }; -void register_lang_c(void) { register_rule(&lang_c_rule); } +struct rule lang_cpp_rule = { + .name = "cpp", + .setup = setup_lang_c_cpp, +}; + +void register_lang_c_cpp(void) { + register_rule(&lang_c_rule); + register_rule(&lang_cpp_rule); +}