diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /Documentation/security | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
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. | |||
| 22 | For more details on capabilities, see capabilities(7) in the Linux | 22 | For more details on capabilities, see capabilities(7) in the Linux |
| 23 | man-pages project. | 23 | man-pages project. |
| 24 | 24 | ||
| 25 | Based on http://kerneltrap.org/Linux/Documenting_Security_Module_Intent, | 25 | Based on https://lkml.org/lkml/2007/10/26/215, |
| 26 | a new LSM is accepted into the kernel when its intent (a description of | 26 | a new LSM is accepted into the kernel when its intent (a description of |
| 27 | what it tries to protect against and in what cases one would expect to | 27 | what it tries to protect against and in what cases one would expect to |
| 28 | use it) has been appropriately documented in Documentation/security/. | 28 | use it) has been appropriately documented in Documentation/security/. |