diff options
author | James Morris <james.l.morris@oracle.com> | 2014-11-19 11:32:12 +0100 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 11:32:12 +0100 |
commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /Documentation/security | |
parent | integrity: do zero padding of the key id (diff) | |
parent | Linux 3.17 (diff) | |
download | linux-b10778a00d40b3d9fdaaf5891e802794781ff71c.tar.xz linux-b10778a00d40b3d9fdaaf5891e802794781ff71c.zip |
Merge commit 'v3.17' into next
Diffstat (limited to 'Documentation/security')
-rw-r--r-- | Documentation/security/LSM.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/security/LSM.txt b/Documentation/security/LSM.txt index c335a763a2ed..3db7e671c440 100644 --- a/Documentation/security/LSM.txt +++ b/Documentation/security/LSM.txt @@ -22,7 +22,7 @@ system, building their checks on top of the defined capability hooks. For more details on capabilities, see capabilities(7) in the Linux man-pages project. -Based on http://kerneltrap.org/Linux/Documenting_Security_Module_Intent, +Based on https://lkml.org/lkml/2007/10/26/215, a new LSM is accepted into the kernel when its intent (a description of what it tries to protect against and in what cases one would expect to use it) has been appropriately documented in Documentation/security/. |