diff options
| author | Kees Cook <keescook@chromium.org> | 2017-05-13 04:51:46 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-05-18 10:32:57 -0600 |
| commit | 5ea672c752d93ef3cfa9ce3ea1fbf204f7056a33 (patch) | |
| tree | da81eb04105a0e6db6057bcdc71c5ac99e03afe6 | |
| parent | 26fccd9ed2e283add2849858c28bd14f84d9c48e (diff) | |
doc: ReSTify tomoyo.txt
Adjusts for ReST markup and moves under LSM admin guide.
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
| -rw-r--r-- | Documentation/admin-guide/LSM/index.rst | 1 | ||||
| -rw-r--r-- | Documentation/admin-guide/LSM/tomoyo.rst (renamed from Documentation/security/tomoyo.txt) | 22 | ||||
| -rw-r--r-- | Documentation/security/00-INDEX | 2 |
3 files changed, 17 insertions, 8 deletions
diff --git a/Documentation/admin-guide/LSM/index.rst b/Documentation/admin-guide/LSM/index.rst index a4db29410ea0..6aa4e0dc588b 100644 --- a/Documentation/admin-guide/LSM/index.rst +++ b/Documentation/admin-guide/LSM/index.rst @@ -35,3 +35,4 @@ the one "major" module (e.g. SELinux) if there is one configured. apparmor SELinux + tomoyo diff --git a/Documentation/security/tomoyo.txt b/Documentation/admin-guide/LSM/tomoyo.rst index 200a2d37cbc8..a5947218fa64 100644 --- a/Documentation/security/tomoyo.txt +++ b/Documentation/admin-guide/LSM/tomoyo.rst @@ -1,21 +1,30 @@ ---- What is TOMOYO? --- +====== +TOMOYO +====== + +What is TOMOYO? +=============== TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel. LiveCD-based tutorials are available at + http://tomoyo.sourceforge.jp/1.7/1st-step/ubuntu10.04-live/ -http://tomoyo.sourceforge.jp/1.7/1st-step/centos5-live/ . +http://tomoyo.sourceforge.jp/1.7/1st-step/centos5-live/ + Though these tutorials use non-LSM version of TOMOYO, they are useful for you to know what TOMOYO is. ---- How to enable TOMOYO? --- +How to enable TOMOYO? +===================== -Build the kernel with CONFIG_SECURITY_TOMOYO=y and pass "security=tomoyo" on +Build the kernel with ``CONFIG_SECURITY_TOMOYO=y`` and pass ``security=tomoyo`` on kernel's command line. Please see http://tomoyo.sourceforge.jp/2.3/ for details. ---- Where is documentation? --- +Where is documentation? +======================= User <-> Kernel interface documentation is available at http://tomoyo.sourceforge.jp/2.3/policy-reference.html . @@ -42,7 +51,8 @@ History of TOMOYO? Realities of Mainlining http://sourceforge.jp/projects/tomoyo/docs/lfj2008.pdf ---- What is future plan? --- +What is future plan? +==================== We believe that inode based security and name based security are complementary and both should be used together. But unfortunately, so far, we cannot enable diff --git a/Documentation/security/00-INDEX b/Documentation/security/00-INDEX index 22ebdc02f0dc..04ef62511ea1 100644 --- a/Documentation/security/00-INDEX +++ b/Documentation/security/00-INDEX @@ -12,5 +12,3 @@ keys-trusted-encrypted.txt - info on the Trusted and Encrypted keys in the kernel key ring service. keys.txt - description of the kernel key retention service. -tomoyo.txt - - documentation on the TOMOYO Linux Security Module. |