github-starred/firejail
2
0
Fork 0
mirror of https://github.com/netblue30/firejail.git synced 2026-05-15 14:16:14 -06:00
Code Issues 531 Projects Packages Wiki Activity Actions 6

mainline merge: fix netfilter-default functionality in /etc/firejail/firejail.config

Browse source
This commit is contained in:
netblue30 2019-01-09 09:27:12 -05:00
parent 44da7a061b
commit 2aec49709b
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/firejail/netfilter.c
View file

@ -69,8 +69,12 @@ void netfilter(const char *fname) {
if (set_perms(SBOX_STDIN_FILE, getuid(), getgid(), 0644))
errExit("set_perms");
if (fname == NULL)
sbox_run(SBOX_USER| SBOX_CAPS_NONE | SBOX_SECCOMP, 2, PATH_FNETFILTER, SBOX_STDIN_FILE);
if (fname == NULL) {
if (netfilter_default)
sbox_run(SBOX_USER| SBOX_CAPS_NONE | SBOX_SECCOMP, 3, PATH_FNETFILTER, netfilter_default, SBOX_STDIN_FILE);
else
sbox_run(SBOX_USER| SBOX_CAPS_NONE | SBOX_SECCOMP, 2, PATH_FNETFILTER, SBOX_STDIN_FILE);
}
else
sbox_run(SBOX_USER| SBOX_CAPS_NONE | SBOX_SECCOMP, 3, PATH_FNETFILTER, fname, SBOX_STDIN_FILE);

8
status
View file

@ -1,5 +1,9 @@
2019: Jan 2
done: Correctly set address length in arp frames
Jan 9: fix netfilter-default functionality in /etc/firejail/firejail.config
Jan 8: test caps join
Jan 8: testing seccomp/join
Jan 8: fix join/seccomp #2296
Jan 2: Correctly set address length in arp frames
Nov 6: mainline merge
done: removed transfer.sh support from travis build