aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-11-17 19:57:29 -0300
committerLibravatar Kelvin M. Klann <kmk3.code@protonmail.com>2023-12-11 22:47:11 -0300
commit760f50f78ad13664d7a32b4577381c0341ab2d4a (patch)
tree36a091d2740c624c13bbdcc46ab32e295f74b19a /contrib
parentlandlock: avoid landlock syscalls before ll_restrict (diff)
downloadfirejail-760f50f78ad13664d7a32b4577381c0341ab2d4a.tar.gz
firejail-760f50f78ad13664d7a32b4577381c0341ab2d4a.tar.zst
firejail-760f50f78ad13664d7a32b4577381c0341ab2d4a.zip
landlock: move commands into profile and add landlock.enforce
Changes: * Move commands from --landlock and --landlock.proc= into etc/inc/landlock-common.inc * Remove --landlock and --landlock.proc= * Add --landlock.enforce Instead of hard-coding the default commands (and having a separate command just for /proc), move them into a dedicated profile to make it easier for users to interact with the entries (view, copy, add ignore entries, etc). Only enforce the Landlock commands if --landlock.enforce is supplied. This allows safely adding Landlock commands to (upstream) profiles while keeping their enforcement opt-in. It also makes it simpler to effectively disable all Landlock commands, by using `--ignore=landlock.enforce`. Relates to #6078.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/syntax/lists/profile_commands_arg0.list2
-rw-r--r--contrib/syntax/lists/profile_commands_arg1.list1
2 files changed, 1 insertions, 2 deletions
diff --git a/contrib/syntax/lists/profile_commands_arg0.list b/contrib/syntax/lists/profile_commands_arg0.list
index 4d49e96d9..0ac70e5cf 100644
--- a/contrib/syntax/lists/profile_commands_arg0.list
+++ b/contrib/syntax/lists/profile_commands_arg0.list
@@ -12,7 +12,7 @@ keep-config-pulse
12keep-dev-shm 12keep-dev-shm
13keep-shell-rc 13keep-shell-rc
14keep-var-tmp 14keep-var-tmp
15landlock 15landlock.enforce
16machine-id 16machine-id
17memory-deny-write-execute 17memory-deny-write-execute
18netfilter 18netfilter
diff --git a/contrib/syntax/lists/profile_commands_arg1.list b/contrib/syntax/lists/profile_commands_arg1.list
index cce37efa0..e76b6ef40 100644
--- a/contrib/syntax/lists/profile_commands_arg1.list
+++ b/contrib/syntax/lists/profile_commands_arg1.list
@@ -30,7 +30,6 @@ iprange
30join-or-start 30join-or-start
31keep-fd 31keep-fd
32landlock.execute 32landlock.execute
33landlock.proc
34landlock.read 33landlock.read
35landlock.special 34landlock.special
36landlock.write 35landlock.write