aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/security/credentials.txt
diff options
context:
space:
mode:
authorKees Cook <kees@outflux.net>2011-11-01 17:20:01 -0700
committerJames Morris <jmorris@namei.org>2011-11-16 12:37:27 +1100
commite163bc8e4a0cd1cdffadb58253f7651201722d56 (patch)
tree66570af9c0304cf53350e8e67c67e407e92ee12f /Documentation/security/credentials.txt
parentinclude/linux/security.h: fix security_inode_init_security() arg (diff)
downloadlinux-dev-e163bc8e4a0cd1cdffadb58253f7651201722d56.tar.xz
linux-dev-e163bc8e4a0cd1cdffadb58253f7651201722d56.zip
Documentation: clarify the purpose of LSMs
Clarify the purpose of the LSM interface with some brief examples and pointers to additional documentation. Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'Documentation/security/credentials.txt')
-rw-r--r--Documentation/security/credentials.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/security/credentials.txt b/Documentation/security/credentials.txt
index fc0366cbd7ce..86257052e31a 100644
--- a/Documentation/security/credentials.txt
+++ b/Documentation/security/credentials.txt
@@ -221,10 +221,10 @@ The Linux kernel supports the following types of credentials:
(5) LSM
The Linux Security Module allows extra controls to be placed over the
- operations that a task may do. Currently Linux supports two main
- alternate LSM options: SELinux and Smack.
+ operations that a task may do. Currently Linux supports several LSM
+ options.
- Both work by labelling the objects in a system and then applying sets of
+ Some work by labelling the objects in a system and then applying sets of
rules (policies) that say what operations a task with one label may do to
an object with another label.