diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-02 21:56:09 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-01-02 21:56:09 +0300 |
| commit | 19f2e267a5d0d26282a64f8f788c482852c95324 (patch) | |
| tree | db0923d0693e15f942c05c7d8ffbeda83ad362a4 /Documentation | |
| parent | 1ac5cd4978794bd060d448acc0305e9fc996ba92 (diff) | |
| parent | 20bb4cb4fb9fb994d757932abc4404cf0f0f56cc (diff) | |
| download | linux-19f2e267a5d0d26282a64f8f788c482852c95324.tar.xz | |
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull smack updates from James Morris:
"Two Smack patches for 4.21.
Jose's patch adds missing documentation and Zoran's fleshes out the
access checks on keyrings"
* 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
Smack: Improve Documentation
smack: fix access permissions for keyring
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/admin-guide/LSM/Smack.rst | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/admin-guide/LSM/Smack.rst b/Documentation/admin-guide/LSM/Smack.rst index 6a5826a13aea..6d44f4fdbf59 100644 --- a/Documentation/admin-guide/LSM/Smack.rst +++ b/Documentation/admin-guide/LSM/Smack.rst @@ -818,6 +818,10 @@ Smack supports some mount options: specifies a label to which all labels set on the filesystem must have read access. Not yet enforced. + smackfstransmute=label: + behaves exactly like smackfsroot except that it also + sets the transmute flag on the root of the mount + These mount options apply to all file system types. Smack auditing |