aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorJames Morris <james.morris@microsoft.com>2018-12-13 19:30:33 -0800
committerJames Morris <james.morris@microsoft.com>2018-12-13 19:30:33 -0800
commit20bb4cb4fb9fb994d757932abc4404cf0f0f56cc (patch)
tree77d80d5d3541d01bf198ebe581e86083d0c77f1d /Documentation
parentsecurity: fs: make inode explicitly non-modular (diff)
parentSmack: Improve Documentation (diff)
downloadlinux-dev-20bb4cb4fb9fb994d757932abc4404cf0f0f56cc.tar.xz
linux-dev-20bb4cb4fb9fb994d757932abc4404cf0f0f56cc.zip
Merge branch 'smack-for-4.21-a' of https://github.com/cschaufler/next-smack into next-smack
From Casey. "I have two Smack patches for 4.21. One Jose's patch adds missing documentation and Zoran's fleshes out the access checks on keyrings."
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/admin-guide/LSM/Smack.rst4
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