History

Merge tag 'landlock-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux

Pull landlock updates from Mickaël Salaün: "Improve user help for Landlock (documentation and sample)" * tag 'landlock-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux: landlock: Fix documentation style landlock: Slightly improve documentation and fix spelling samples/landlock: Print hints about ABI versions

Linus Torvalds committed 4 years ago

Commit 522667b2 parents c645c11 2fff00c6 files · +76 −54Browse files

Showing the changes to include/uapi/linux (1 of 6 files). Show all

Unified · Split

include/uapi/linux/landlock.h+5−5
@@ -26,7 +26,7 @@ struct landlock_ruleset_attr { · 25 unmodified lines
2626 * Landlock filesystem access rights that are not part of
2727 * handled_access_fs are allowed. This is needed for backward
2828 * compatibility reasons. One exception is the
29− * LANDLOCK_ACCESS_FS_REFER access right, which is always implicitly
29+ * %LANDLOCK_ACCESS_FS_REFER access right, which is always implicitly
3030 * handled, but must still be explicitly handled to add new rules with
3131 * this access right.
3232 */
@@ -128,11 +128,11 @@ struct landlock_path_beneath_attr { · 95 unmodified lines
128128 * hierarchy must also always have the same or a superset of restrictions of
129129 * the source hierarchy. If it is not the case, or if the domain doesn't
130130 * handle this access right, such actions are denied by default with errno
131− * set to EXDEV. Linking also requires a LANDLOCK_ACCESS_FS_MAKE_* access
132− * right on the destination directory, and renaming also requires a
133− * LANDLOCK_ACCESS_FS_REMOVE_* access right on the source's (file or
131+ * set to ``EXDEV``. Linking also requires a ``LANDLOCK_ACCESS_FS_MAKE_*``
132+ * access right on the destination directory, and renaming also requires a
133+ * ``LANDLOCK_ACCESS_FS_REMOVE_*`` access right on the source's (file or
134134 * directory) parent. Otherwise, such actions are denied with errno set to
135− * EACCES. The EACCES errno prevails over EXDEV to let user space
135+ * ``EACCES``. The ``EACCES`` errno prevails over ``EXDEV`` to let user space
136136 * efficiently deal with an unrecoverable error.
137137 *
138138 * .. warning::