Skip to content

Commit c6512ef

Browse files
l0koda-nogikh
authored andcommitted
sys/linux: add Landlock syscall flags
Add the new LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF, LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON, and LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_ON flags for landlock_restrict_self(2) from Linux 6.15 (audit support for Landlock). Also add the LANDLOCK_CREATE_RULESET_VERSION and LANDLOCK_CREATE_RULESET_ERRATA flags for landlock_create_ruleset(2). Signed-off-by: Mickaël Salaün <mic@linux.microsoft.com>
1 parent 6233055 commit c6512ef

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

sys/linux/landlock.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ include <uapi/linux/landlock.h>
55

66
resource fd_ruleset[fd]
77

8-
landlock_create_ruleset(attr ptr[in, landlock_ruleset_attr], size bytesize[attr], flags const[0]) fd_ruleset
8+
landlock_create_ruleset(attr ptr[in, landlock_ruleset_attr], size bytesize[attr], flags flags[landlock_create_ruleset_flags]) fd_ruleset
99

1010
landlock_add_rule$LANDLOCK_RULE_PATH_BENEATH(ruleset_fd fd_ruleset, rule_type const[LANDLOCK_RULE_PATH_BENEATH], rule_attr ptr[in, landlock_path_beneath_attr], flags const[0])
1111

1212
landlock_add_rule$LANDLOCK_RULE_NET_PORT(ruleset_fd fd_ruleset, rule_type const[LANDLOCK_RULE_NET_PORT], rule_attr ptr[in, landlock_net_port_attr], flags const[0])
1313

14-
landlock_restrict_self(ruleset_fd fd_ruleset, flags const[0])
14+
landlock_restrict_self(ruleset_fd fd_ruleset, flags flags[landlock_restrict_self_flags])
1515

1616
landlock_ruleset_attr {
1717
handled_access_fs flags[landlock_access_fs_flags, int64]
@@ -32,6 +32,10 @@ landlock_net_port_attr {
3232
# TODO(glider): remove this line once LANDLOCK_ACCESS_FS_IOCTL_DEV hits upstream.
3333
define LANDLOCK_ACCESS_FS_IOCTL_DEV (1ULL << 15)
3434

35+
landlock_create_ruleset_flags = LANDLOCK_CREATE_RULESET_VERSION, LANDLOCK_CREATE_RULESET_ERRATA
36+
37+
landlock_restrict_self_flags = LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF, LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON, LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF
38+
3539
landlock_access_fs_flags = LANDLOCK_ACCESS_FS_EXECUTE, LANDLOCK_ACCESS_FS_WRITE_FILE, LANDLOCK_ACCESS_FS_READ_FILE, LANDLOCK_ACCESS_FS_READ_DIR, LANDLOCK_ACCESS_FS_REMOVE_DIR, LANDLOCK_ACCESS_FS_REMOVE_FILE, LANDLOCK_ACCESS_FS_MAKE_CHAR, LANDLOCK_ACCESS_FS_MAKE_DIR, LANDLOCK_ACCESS_FS_MAKE_REG, LANDLOCK_ACCESS_FS_MAKE_SOCK, LANDLOCK_ACCESS_FS_MAKE_FIFO, LANDLOCK_ACCESS_FS_MAKE_BLOCK, LANDLOCK_ACCESS_FS_MAKE_SYM, LANDLOCK_ACCESS_FS_REFER, LANDLOCK_ACCESS_FS_TRUNCATE, LANDLOCK_ACCESS_FS_IOCTL_DEV
3640

3741
landlock_access_net_flags = LANDLOCK_ACCESS_NET_BIND_TCP, LANDLOCK_ACCESS_NET_CONNECT_TCP

sys/linux/landlock.txt.const

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ LANDLOCK_ACCESS_FS_TRUNCATE = 16384
1818
LANDLOCK_ACCESS_FS_WRITE_FILE = 2
1919
LANDLOCK_ACCESS_NET_BIND_TCP = 1
2020
LANDLOCK_ACCESS_NET_CONNECT_TCP = 2
21+
LANDLOCK_CREATE_RULESET_ERRATA = 2
22+
LANDLOCK_CREATE_RULESET_VERSION = 1
23+
LANDLOCK_RESTRICT_SELF_LOG_NEW_EXEC_ON = 2
24+
LANDLOCK_RESTRICT_SELF_LOG_SAME_EXEC_OFF = 1
25+
LANDLOCK_RESTRICT_SELF_LOG_SUBDOMAINS_OFF = 4
2126
LANDLOCK_RULE_NET_PORT = 2
2227
LANDLOCK_RULE_PATH_BENEATH = 1
2328
LANDLOCK_SCOPE_ABSTRACT_UNIX_SOCKET = 1

0 commit comments

Comments
 (0)