diff options
author | rusty-snake <41237666+rusty-snake@users.noreply.github.com> | 2020-06-11 22:21:39 +0200 |
---|---|---|
committer | rusty-snake <41237666+rusty-snake@users.noreply.github.com> | 2020-06-11 22:21:39 +0200 |
commit | 9c138be9e87bac2d7bf6095d6921d768e94f9463 (patch) | |
tree | 2ea02d4704d3ca99fac6fe3586ae7a436b1c72bc | |
parent | #3462 (diff) | |
download | firejail-9c138be9e87bac2d7bf6095d6921d768e94f9463.tar.gz firejail-9c138be9e87bac2d7bf6095d6921d768e94f9463.tar.zst firejail-9c138be9e87bac2d7bf6095d6921d768e94f9463.zip |
mmapfail.sh fix
https://github.com/hannob/mmapfail
-rw-r--r-- | etc/profile-a-l/apostrophe.profile | 12 | ||||
-rw-r--r-- | test/filters/memwrexe.c | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/etc/profile-a-l/apostrophe.profile b/etc/profile-a-l/apostrophe.profile index 5dfe034e0..c68cd3a46 100644 --- a/etc/profile-a-l/apostrophe.profile +++ b/etc/profile-a-l/apostrophe.profile | |||
@@ -49,18 +49,6 @@ private-bin apostrophe,python3* | |||
49 | private-cache | 49 | private-cache |
50 | private-dev | 50 | private-dev |
51 | private-etc alternatives,dconf,fonts,gtk-3.0,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,pango,X11 | 51 | private-etc alternatives,dconf,fonts,gtk-3.0,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,pango,X11 |
52 | # private-etc templates (see also #1734, #2093) | ||
53 | # Common: alternatives,ld.so.cache,ld.so.conf,ld.so.conf.d,ld.so.preload,locale,locale.alias,locale.conf,localtime,mime.types,xdg | ||
54 | # Extra: magic,magic.mgc,passwd,group | ||
55 | # Networking: ca-certificates,ssl,pki,crypto-policies,nsswitch.conf,resolv.conf,hosts,host.conf,hostname,protocols,services,rpc | ||
56 | # Extra: proxychains.conf,gai.conf | ||
57 | # Sound: alsa,asound.conf,pulse,machine-id | ||
58 | # GUI: fonts,pango,X11 | ||
59 | # GTK: dconf,gconf,gtk-2.0,gtk-3.0 | ||
60 | # Qt: Trolltech.conf | ||
61 | # KDE: kde4rc,kde5rc | ||
62 | # 3D: drirc,glvnd,bumblebee,nvidia | ||
63 | # D-Bus: dbus-1,machine-id | ||
64 | private-tmp | 52 | private-tmp |
65 | 53 | ||
66 | dbus-user filter | 54 | dbus-user filter |
diff --git a/test/filters/memwrexe.c b/test/filters/memwrexe.c index 797e7881d..e68176b42 100644 --- a/test/filters/memwrexe.c +++ b/test/filters/memwrexe.c | |||
@@ -65,7 +65,7 @@ int main(int argc, char **argv) { | |||
65 | } | 65 | } |
66 | 66 | ||
67 | void *p = mmap (0, size, PROT_READ, MAP_SHARED, fd, 0); | 67 | void *p = mmap (0, size, PROT_READ, MAP_SHARED, fd, 0); |
68 | if (!p) { | 68 | if (p == MAP_FAILED) { |
69 | fprintf(stderr, "TESTING ERROR: cannot map file for mprotect test\n"); | 69 | fprintf(stderr, "TESTING ERROR: cannot map file for mprotect test\n"); |
70 | return 1; | 70 | return 1; |
71 | } | 71 | } |