aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar netblue <netblue@debian>2022-01-21 10:13:22 -0500
committerLibravatar netblue <netblue@debian>2022-01-21 10:13:22 -0500
commit39654d01661ea9310b9b886a572ee24b1e4c9cfb (patch)
tree88c9787f0cbb50e2c237ade62c89f8dccc5da9f2
parentallow apostrophe in whitelist/blacklist ( #4614) (diff)
downloadfirejail-39654d01661ea9310b9b886a572ee24b1e4c9cfb.tar.gz
firejail-39654d01661ea9310b9b886a572ee24b1e4c9cfb.tar.zst
firejail-39654d01661ea9310b9b886a572ee24b1e4c9cfb.zip
adding netlink to --protocol list (#4605)
-rw-r--r--RELNOTES1
-rw-r--r--src/fseccomp/protocol.c4
-rw-r--r--src/man/firejail-profile.txt3
-rw-r--r--src/man/firejail.txt2
4 files changed, 7 insertions, 3 deletions
diff --git a/RELNOTES b/RELNOTES
index eefa77ad7..18ff04ba5 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -12,6 +12,7 @@ firejail (0.9.68rc1) baseline; urgency=low
12 * build: firecfg.config is now installed to /etc/firejail/ (#4669) 12 * build: firecfg.config is now installed to /etc/firejail/ (#4669)
13 * removed --disable-whitelist at compile time 13 * removed --disable-whitelist at compile time
14 * removed whitelist=yes/no in /etc/firejail/firejail.config 14 * removed whitelist=yes/no in /etc/firejail/firejail.config
15 * added netlink to --protocol list (#4605)
15 * new condition: ALLOW_TRAY (#4510 #4599) 16 * new condition: ALLOW_TRAY (#4510 #4599)
16 * remove (some) environment variables with auth-tokens (#4157) 17 * remove (some) environment variables with auth-tokens (#4157)
17 * new includes: whitelist-run-common.inc (#4288), disable-X11.inc (#4462) 18 * new includes: whitelist-run-common.inc (#4288), disable-X11.inc (#4462)
diff --git a/src/fseccomp/protocol.c b/src/fseccomp/protocol.c
index 25742c173..b072f6ad6 100644
--- a/src/fseccomp/protocol.c
+++ b/src/fseccomp/protocol.c
@@ -58,6 +58,7 @@ static char *protocol[] = {
58 "netlink", 58 "netlink",
59 "packet", 59 "packet",
60 "bluetooth", 60 "bluetooth",
61 "netlink",
61 NULL 62 NULL
62}; 63};
63 64
@@ -68,7 +69,8 @@ static struct sock_filter protocol_filter_command[] = {
68 WHITELIST(AF_INET6), 69 WHITELIST(AF_INET6),
69 WHITELIST(AF_NETLINK), 70 WHITELIST(AF_NETLINK),
70 WHITELIST(AF_PACKET), 71 WHITELIST(AF_PACKET),
71 WHITELIST(AF_BLUETOOTH) 72 WHITELIST(AF_BLUETOOTH),
73 WHITELIST(AF_NETLINK)
72}; 74};
73#endif 75#endif
74// Note: protocol[] and protocol_filter_command are synchronized 76// Note: protocol[] and protocol_filter_command are synchronized
diff --git a/src/man/firejail-profile.txt b/src/man/firejail-profile.txt
index 5ce07c2ca..f4f157b9e 100644
--- a/src/man/firejail-profile.txt
+++ b/src/man/firejail-profile.txt
@@ -504,7 +504,8 @@ There is no root account (uid 0) defined in the namespace.
504\fBprotocol protocol1,protocol2,protocol3 504\fBprotocol protocol1,protocol2,protocol3
505Enable protocol filter. The filter is based on seccomp and checks the 505Enable protocol filter. The filter is based on seccomp and checks the
506first argument to socket system call. Recognized values: \fBunix\fR, 506first argument to socket system call. Recognized values: \fBunix\fR,
507\fBinet\fR, \fBinet6\fR, \fBnetlink\fR, \fBpacket\fR and \fBbluetooth\fR. 507\fBinet\fR, \fBinet6\fR, \fBnetlink\fR, \fBpacket\fR, \fBbluetooth\fR and \fBnetlink\fR.
508Multiple protocol commands are allowed.
508.TP 509.TP
509\fBseccomp 510\fBseccomp
510Enable seccomp filter and blacklist the syscalls in the default list. See man 1 firejail for more details. 511Enable seccomp filter and blacklist the syscalls in the default list. See man 1 firejail for more details.
diff --git a/src/man/firejail.txt b/src/man/firejail.txt
index 9e3bce643..385e8af28 100644
--- a/src/man/firejail.txt
+++ b/src/man/firejail.txt
@@ -2167,7 +2167,7 @@ $ firejail \-\-profile.print=browser
2167.TP 2167.TP
2168\fB\-\-protocol=protocol,protocol,protocol 2168\fB\-\-protocol=protocol,protocol,protocol
2169Enable protocol filter. The filter is based on seccomp and checks the first argument to socket system call. 2169Enable protocol filter. The filter is based on seccomp and checks the first argument to socket system call.
2170Recognized values: unix, inet, inet6, netlink, packet and bluetooth. This option is not supported for i386 architecture. 2170Recognized values: unix, inet, inet6, netlink, packet, bluetooth and netlink. This option is not supported for i386 architecture.
2171.br 2171.br
2172 2172
2173.br 2173.br