diff options
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/fuse.h | 10 | ||||
| -rw-r--r-- | include/uapi/linux/landlock.h | 24 |
2 files changed, 20 insertions, 14 deletions
diff --git a/include/uapi/linux/fuse.h b/include/uapi/linux/fuse.h index 616430a2973c..cb9e9554f0ef 100644 --- a/include/uapi/linux/fuse.h +++ b/include/uapi/linux/fuse.h @@ -257,6 +257,7 @@ * - add backing_id_64 to fuse_open_out * - add FUSE_NOTIFY_BACKING_MAP, fuse_notify_backing_map_out, fuse_extent * - add FUSE_BACKING_MAP_CREATE, FUSE_BACKING_MAP_CYCLIC + * - extend the meaning of FUSE_HAS_INODE_DAX and FUSE_ATTR_DAX */ #ifndef _LINUX_FUSE_H @@ -460,7 +461,11 @@ struct fuse_file_lock { * FUSE_INIT_RESERVED: reserved, do not use * FUSE_SECURITY_CTX: add security context to create, mkdir, symlink, and * mknod - * FUSE_HAS_INODE_DAX: use per inode DAX + * FUSE_HAS_INODE_DAX: use per inode DAX. The meaning depends on the + * transport: on virtio-fs it indicates per-inode DAX + * support, while on /dev/fuse (where FUSE_PASSTHROUGH_V2 + * is also offered) it indicates support for passthrough + * extent maps on a DAX device. * FUSE_CREATE_SUPP_GROUP: add supplementary group info to create, mkdir, * symlink and mknod (single group that matches parent) * FUSE_HAS_EXPIRE_ONLY: kernel supports expiry-only entry invalidation @@ -612,7 +617,8 @@ struct fuse_file_lock { * fuse_attr flags * * FUSE_ATTR_SUBMOUNT: Object is a submount root - * FUSE_ATTR_DAX: Enable DAX for this file in per inode DAX mode + * FUSE_ATTR_DAX: Enable DAX for this file in per inode DAX mode and in + * extent mapping passthrough mode */ #define FUSE_ATTR_SUBMOUNT (1 << 0) #define FUSE_ATTR_DAX (1 << 1) diff --git a/include/uapi/linux/landlock.h b/include/uapi/linux/landlock.h index 24510e5d8479..8ce0406ba543 100644 --- a/include/uapi/linux/landlock.h +++ b/include/uapi/linux/landlock.h @@ -22,10 +22,10 @@ * enacted. Vice versa, access rights that are not specifically listed here are * not going to be denied by this ruleset when it is enacted. * - * For historical reasons, the %LANDLOCK_ACCESS_FS_REFER right is always denied - * by default, even when its bit is not set in @handled_access_fs. In order to - * add new rules with this access right, the bit must still be set explicitly - * (cf. `Filesystem flags`_). + * For historical reasons, as soon as any filesystem access right is handled in + * @handled_access_fs, the %LANDLOCK_ACCESS_FS_REFER right is always denied as + * well. In order to add new rules with this access right, the bit must still + * be set explicitly (cf. `Filesystem flags`_). * * The explicit listing of *handled access rights* is required for backwards * compatibility reasons. In most use cases, processes that use Landlock will @@ -462,10 +462,11 @@ struct landlock_capability_attr { * This access right is available since the second version of the Landlock * ABI. * - * This is the only access right which is denied by default by any ruleset, - * even if the right is not specified as handled at ruleset creation time. - * The only way to make a ruleset grant this right is to explicitly allow it - * for a specific directory by adding a matching rule to the ruleset. + * This is the only access right which is denied by default by any ruleset + * that handles filesystem access rights, even if the right is not specified + * as handled at ruleset creation time. The only way to make a ruleset grant + * this right is to explicitly allow it for a specific directory by adding a + * matching rule to the ruleset. * * In particular, when using the first Landlock ABI version, Landlock will * always deny attempts to reparent files between different directories. @@ -622,10 +623,9 @@ struct landlock_capability_attr { * - %LANDLOCK_PERMISSION_CAPABILITY_USE: Restrict the use of specific Linux * capabilities. A process in a Landlock domain that handles this permission * is denied from exercising capabilities that are not explicitly allowed by a - * %LANDLOCK_RULE_CAPABILITY rule. This hook is purely restrictive: it can - * deny capabilities that the kernel would otherwise grant, but it can never - * grant capabilities that the kernel already denied. Support added in - * Landlock ABI version 12. + * %LANDLOCK_RULE_CAPABILITY rule. Landlock only reduces the capabilities + * that processes can use: it does not let them use capabilities that they + * would not have without Landlock. Support added in Landlock ABI version 12. */ #define LANDLOCK_PERMISSION_NAMESPACE_USE (1ULL << 0) #define LANDLOCK_PERMISSION_CAPABILITY_USE (1ULL << 1) |
