aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/firejail/main.c10
-rw-r--r--src/firejail/seccomp.c4
-rw-r--r--src/fsec-print/main.c8
-rwxr-xr-xtest/compile/compile.sh19
4 files changed, 35 insertions, 6 deletions
diff --git a/src/firejail/main.c b/src/firejail/main.c
index 922ba2edb..d550e8df9 100644
--- a/src/firejail/main.c
+++ b/src/firejail/main.c
@@ -966,8 +966,15 @@ static void run_builder(int argc, char **argv) {
966 exit(1); 966 exit(1);
967} 967}
968 968
969void filter_add_errno(int fd, int syscall, int arg, void *ptrarg, bool native) {} 969void filter_add_errno(int fd, int syscall, int arg, void *ptrarg, bool native) {
970 (void) fd;
971 (void) syscall;
972 (void) arg;
973 (void) ptrarg;
974 (void) native;
975}
970 976
977#ifdef HAVE_SECCOMP
971static int check_postexec(const char *list) { 978static int check_postexec(const char *list) {
972 char *prelist, *postlist; 979 char *prelist, *postlist;
973 980
@@ -978,6 +985,7 @@ static int check_postexec(const char *list) {
978 } 985 }
979 return 0; 986 return 0;
980} 987}
988#endif
981 989
982//******************************************* 990//*******************************************
983// Main program 991// Main program
diff --git a/src/firejail/seccomp.c b/src/firejail/seccomp.c
index b0a48591e..612ece85d 100644
--- a/src/firejail/seccomp.c
+++ b/src/firejail/seccomp.c
@@ -324,14 +324,12 @@ int seccomp_filter_keep(bool native) {
324 if (arg_debug) 324 if (arg_debug)
325 printf("Build keep seccomp filter\n"); 325 printf("Build keep seccomp filter\n");
326 326
327 const char *command, *filter, *postexec_filter, *list; 327 const char *filter, *postexec_filter, *list;
328 if (native) { 328 if (native) {
329 command = "keep";
330 filter = RUN_SECCOMP_CFG; 329 filter = RUN_SECCOMP_CFG;
331 postexec_filter = RUN_SECCOMP_POSTEXEC; 330 postexec_filter = RUN_SECCOMP_POSTEXEC;
332 list = cfg.seccomp_list_keep; 331 list = cfg.seccomp_list_keep;
333 } else { 332 } else {
334 command = "keep32";
335 filter = RUN_SECCOMP_32; 333 filter = RUN_SECCOMP_32;
336 postexec_filter = RUN_SECCOMP_POSTEXEC_32; 334 postexec_filter = RUN_SECCOMP_POSTEXEC_32;
337 list = cfg.seccomp_list_keep32; 335 list = cfg.seccomp_list_keep32;
diff --git a/src/fsec-print/main.c b/src/fsec-print/main.c
index 7bb4fd0cd..8b7c68434 100644
--- a/src/fsec-print/main.c
+++ b/src/fsec-print/main.c
@@ -25,7 +25,13 @@ static void usage(void) {
25} 25}
26 26
27int arg_quiet = 0; 27int arg_quiet = 0;
28void filter_add_errno(int fd, int syscall, int arg, void *ptrarg, bool native) {} 28void filter_add_errno(int fd, int syscall, int arg, void *ptrarg, bool native) {
29 (void) fd;
30 (void) syscall;
31 (void) arg;
32 (void) ptrarg;
33 (void) native;
34}
29 35
30int main(int argc, char **argv) { 36int main(int argc, char **argv) {
31#if 0 37#if 0
diff --git a/test/compile/compile.sh b/test/compile/compile.sh
index ccf37dc40..2f9e0ece6 100755
--- a/test/compile/compile.sh
+++ b/test/compile/compile.sh
@@ -10,7 +10,7 @@ arr[4]="TEST 4: compile firetunnel disabled"
10arr[5]="TEST 5: compile user namespace disabled" 10arr[5]="TEST 5: compile user namespace disabled"
11arr[6]="TEST 6: compile network disabled" 11arr[6]="TEST 6: compile network disabled"
12arr[7]="TEST 7: compile X11 disabled" 12arr[7]="TEST 7: compile X11 disabled"
13arr[8]="deprecated: TEST 8: compile network restricted" 13arr[8]="TEST 8: compile selinux"
14arr[9]="TEST 9: compile file transfer disabled" 14arr[9]="TEST 9: compile file transfer disabled"
15arr[10]="TEST 10: compile disable whitelist" 15arr[10]="TEST 10: compile disable whitelist"
16arr[11]="TEST 11: compile disable global config" 16arr[11]="TEST 11: compile disable global config"
@@ -183,6 +183,23 @@ cp output-configure oc7
183cp output-make om7 183cp output-make om7
184rm output-configure output-make 184rm output-configure output-make
185 185
186#*****************************************************************
187# TEST 8
188#*****************************************************************
189# - enable selinux
190#*****************************************************************
191print_title "${arr[8]}"
192# seccomp
193cd firejail
194make distclean
195./configure --prefix=/usr --enable-selinux --enable-fatal-warnings 2>&1 | tee ../output-configure
196make -j4 2>&1 | tee ../output-make
197cd ..
198grep Warning output-configure output-make > ./report-test8
199grep Error output-configure output-make >> ./report-test8
200cp output-configure oc8
201cp output-make om8
202rm output-configure output-make
186 203
187#***************************************************************** 204#*****************************************************************
188# TEST 9 205# TEST 9