Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ea672c7 authored by Kees Cook's avatar Kees Cook Committed by Jonathan Corbet
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent 26fccd9e

Documentation/admin-guide/LSM/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -35,3 +35,4 @@ the one "major" module (e.g. SELinux) if there is one configured. 


   apparmor

   SELinux

   tomoyo

Documentation/security/tomoyo.txt→Documentation/admin-guide/LSM/tomoyo.rst

+16 −6
Original line number Diff line number Diff line 
--- 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

Documentation/security/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -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.