aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue30 <netblue30@protonmail.com>2021-12-18 19:07:08 -0500
committerLibravatar netblue30 <netblue30@protonmail.com>2021-12-18 19:07:08 -0500
commit3fc2b91a82c2ddc780d8b6b11390ec9ce4e4255c (patch)
tree47720cc27dc5181623456ce2fdb0a66632b6de2a
parentMerge pull request #4782 from jose1711/nextcloud_usrshare (diff)
downloadfirejail-3fc2b91a82c2ddc780d8b6b11390ec9ce4e4255c.tar.gz
firejail-3fc2b91a82c2ddc780d8b6b11390ec9ce4e4255c.tar.zst
firejail-3fc2b91a82c2ddc780d8b6b11390ec9ce4e4255c.zip
testing
-rw-r--r--Makefile.in1
-rw-r--r--README5
-rwxr-xr-xtest/filters/memwrexebin17096 -> 17096 bytes
-rwxr-xr-xtest/filters/memwrexe-32bin6678 -> 15800 bytes
-rw-r--r--test/filters/memwrexe.c14
5 files changed, 18 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in
index d39c2b0ba..31c2442ed 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -83,6 +83,7 @@ clean:
83 rm -f $(SECCOMP_FILTERS) 83 rm -f $(SECCOMP_FILTERS)
84 rm -f test/utils/index.html* 84 rm -f test/utils/index.html*
85 rm -f test/utils/wget-log 85 rm -f test/utils/wget-log
86 rm -f test/utils/firejail-test-file*
86 rm -f test/utils/lstesting 87 rm -f test/utils/lstesting
87 rm -f test/environment/index.html* 88 rm -f test/environment/index.html*
88 rm -f test/environment/wget-log* 89 rm -f test/environment/wget-log*
diff --git a/README b/README
index c762c471b..4a333d053 100644
--- a/README
+++ b/README
@@ -562,6 +562,7 @@ Jose Riha (https://github.com/jose1711)
562 - fix warshow, jumpnbump, tremulous, blobwars profile fixes 562 - fix warshow, jumpnbump, tremulous, blobwars profile fixes
563 - drop noinput for games with gampad/joystick support 563 - drop noinput for games with gampad/joystick support
564 - goldendict profile fix 564 - goldendict profile fix
565 - whitelist /usr/share/nextcloud to allow access to translation files
565jrabe (https://github.com/jrabe) 566jrabe (https://github.com/jrabe)
566 - disallow access to kdbx files 567 - disallow access to kdbx files
567 - Epiphany profile 568 - Epiphany profile
@@ -882,6 +883,8 @@ Sebastian Hafner (https://github.com/DropNib)
882Senemu (https://github.com/Senemu) 883Senemu (https://github.com/Senemu)
883 - protection for .pythonrc.py 884 - protection for .pythonrc.py
884 - fixed evince 885 - fixed evince
886Seonwoo Lee (https://github.com/seonwoolee)
887 - fix teams ignoring input sources e.g. microphones
885Sergey Alirzaev (https://github.com/l29ah) 888Sergey Alirzaev (https://github.com/l29ah)
886 - firejail.h enum fix 889 - firejail.h enum fix
887 - firefox-common-addons.inc: + tridactyl 890 - firefox-common-addons.inc: + tridactyl
@@ -1106,6 +1109,8 @@ Hugo Osvaldo Barrera (https://github.com/WhyNotHugo)
1106 - Skype profile tweaks 1109 - Skype profile tweaks
1107xee5ch (https://github.com/xee5ch) 1110xee5ch (https://github.com/xee5ch)
1108 - skypeforlinux profile 1111 - skypeforlinux profile
1112York Zhao (https://github.com/YorkZ)
1113 - tor browser profile fix
1109Ypnose (https://github.com/Ypnose) 1114Ypnose (https://github.com/Ypnose)
1110 - disable-shell.inc: add mksh shell 1115 - disable-shell.inc: add mksh shell
1111yumkam (https://github.com/yumkam) 1116yumkam (https://github.com/yumkam)
diff --git a/test/filters/memwrexe b/test/filters/memwrexe
index 669f0d320..1173cdc07 100755
--- a/test/filters/memwrexe
+++ b/test/filters/memwrexe
Binary files differ
diff --git a/test/filters/memwrexe-32 b/test/filters/memwrexe-32
index 70c98b796..bdf71dcb4 100755
--- a/test/filters/memwrexe-32
+++ b/test/filters/memwrexe-32
Binary files differ
diff --git a/test/filters/memwrexe.c b/test/filters/memwrexe.c
index 4fbf05f78..d8bf4edaa 100644
--- a/test/filters/memwrexe.c
+++ b/test/filters/memwrexe.c
@@ -42,6 +42,11 @@ int main(int argc, char **argv) {
42 } 42 }
43 43
44 void *p = mmap (0, size, PROT_WRITE|PROT_READ|PROT_EXEC, MAP_SHARED, fd, 0); 44 void *p = mmap (0, size, PROT_WRITE|PROT_READ|PROT_EXEC, MAP_SHARED, fd, 0);
45 if (p == MAP_FAILED) {
46 printf("mmap failed\n");
47 return 0;
48 }
49
45 printf("mmap successful\n"); 50 printf("mmap successful\n");
46 51
47 // wait for expect to timeout 52 // wait for expect to timeout
@@ -70,7 +75,12 @@ int main(int argc, char **argv) {
70 return 1; 75 return 1;
71 } 76 }
72 77
73 mprotect(p, size, PROT_READ|PROT_WRITE|PROT_EXEC); 78 int rv = mprotect(p, size, PROT_READ|PROT_WRITE|PROT_EXEC);
79 if (rv) {
80 printf("mprotect failed\n");
81 return 1;
82 }
83
74 printf("mprotect successful\n"); 84 printf("mprotect successful\n");
75 85
76 // wait for expect to timeout 86 // wait for expect to timeout
@@ -82,7 +92,7 @@ int main(int argc, char **argv) {
82 else if (strcmp(argv[1], "memfd_create") == 0) { 92 else if (strcmp(argv[1], "memfd_create") == 0) {
83 int fd = syscall(SYS_memfd_create, "memfd_create", 0); 93 int fd = syscall(SYS_memfd_create, "memfd_create", 0);
84 if (fd == -1) { 94 if (fd == -1) {
85 fprintf(stderr, "TESTING ERROR: cannot run memfd_create test\n"); 95 printf("memfd_create failed\n");
86 return 1; 96 return 1;
87 } 97 }
88 printf("memfd_create successful\n"); 98 printf("memfd_create successful\n");