From e812177d8b1ca6d501d010be1c4e7efff3cc011c Mon Sep 17 00:00:00 2001 From: Mickaël Salaün Date: Mon, 29 Apr 2024 15:46:10 +0200 Subject: sys/linux: update the Landlock IOCTL access right MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We renamed LANDLOCK_ACCESS_FS_IOCTL to LANDLOCK_ACCESS_FS_IOCTL_DEV, but the value is still the same. Signed-off-by: Mickaël Salaün --- sys/linux/landlock.txt | 2 +- sys/linux/landlock.txt.const | 2 +- sys/linux/test/landlock_fs_ioctl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'sys') diff --git a/sys/linux/landlock.txt b/sys/linux/landlock.txt index 86215b4f7..01a62bb4d 100644 --- a/sys/linux/landlock.txt +++ b/sys/linux/landlock.txt @@ -28,6 +28,6 @@ landlock_net_port_attr { port int64 } -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 +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 landlock_access_net_flags = LANDLOCK_ACCESS_NET_BIND_TCP, LANDLOCK_ACCESS_NET_CONNECT_TCP diff --git a/sys/linux/landlock.txt.const b/sys/linux/landlock.txt.const index f305e078a..1fce9aa48 100644 --- a/sys/linux/landlock.txt.const +++ b/sys/linux/landlock.txt.const @@ -1,7 +1,7 @@ # Code generated by syz-sysgen. DO NOT EDIT. arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x LANDLOCK_ACCESS_FS_EXECUTE = 1 -LANDLOCK_ACCESS_FS_IOCTL = 32768 +LANDLOCK_ACCESS_FS_IOCTL_DEV = 32768 LANDLOCK_ACCESS_FS_MAKE_BLOCK = 2048 LANDLOCK_ACCESS_FS_MAKE_CHAR = 64 LANDLOCK_ACCESS_FS_MAKE_DIR = 128 diff --git a/sys/linux/test/landlock_fs_ioctl b/sys/linux/test/landlock_fs_ioctl index bfdb3e916..35c16ef0e 100644 --- a/sys/linux/test/landlock_fs_ioctl +++ b/sys/linux/test/landlock_fs_ioctl @@ -2,7 +2,7 @@ mknodat(0xffffffffffffff9c, &AUTO='./file0\x00', 0x81c0, 0x0) -# Creates a ruleset to restrict most filesystem IOCTLs: LANDLOCK_ACCESS_FS_IOCTL. +# Creates a ruleset to restrict most filesystem IOCTLs: LANDLOCK_ACCESS_FS_IOCTL_DEV. r0 = landlock_create_ruleset(&AUTO={0x8000, 0x0}, AUTO, 0x0) -- cgit mrf-deployment