Commit 2faf6332 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tomoyo-pr-20240606' of git://git.code.sf.net/p/tomoyo/tomoyo 

Pull tomoyo fixlet from Tetsuo Handa:
 "Single patch to update project links, no behavior changes"

* tag 'tomoyo-pr-20240606' of git://git.code.sf.net/p/tomoyo/tomoyo:
  tomoyo: update project links
parents a34adf60 c6144a21

Documentation/admin-guide/LSM/tomoyo.rst

+11 −24
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ TOMOYO is a name-based MAC extension (LSM module) for the Linux kernel. 


LiveCD-based tutorials are available at



http://tomoyo.sourceforge.jp/1.8/ubuntu12.04-live.html

http://tomoyo.sourceforge.jp/1.8/centos6-live.html

https://tomoyo.sourceforge.net/1.8/ubuntu12.04-live.html

https://tomoyo.sourceforge.net/1.8/centos6-live.html



Though these tutorials use non-LSM version of TOMOYO, they are useful for you

to know what TOMOYO is.
@@ -21,45 +21,32 @@ How to enable TOMOYO? 
Build the kernel with ``CONFIG_SECURITY_TOMOYO=y`` and pass ``security=tomoyo`` on

kernel's command line.



Please see http://tomoyo.osdn.jp/2.5/ for details.

Please see https://tomoyo.sourceforge.net/2.6/ for details.



Where is documentation?

=======================



User <-> Kernel interface documentation is available at

https://tomoyo.osdn.jp/2.5/policy-specification/index.html .

https://tomoyo.sourceforge.net/2.6/policy-specification/index.html .



Materials we prepared for seminars and symposiums are available at

https://osdn.jp/projects/tomoyo/docs/?category_id=532&language_id=1 .

https://sourceforge.net/projects/tomoyo/files/docs/ .

Below lists are chosen from three aspects.



What is TOMOYO?

  TOMOYO Linux Overview

    https://osdn.jp/projects/tomoyo/docs/lca2009-takeda.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/lca2009-takeda.pdf

  TOMOYO Linux: pragmatic and manageable security for Linux

    https://osdn.jp/projects/tomoyo/docs/freedomhectaipei-tomoyo.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/freedomhectaipei-tomoyo.pdf

  TOMOYO Linux: A Practical Method to Understand and Protect Your Own Linux Box

    https://osdn.jp/projects/tomoyo/docs/PacSec2007-en-no-demo.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/PacSec2007-en-no-demo.pdf



What can TOMOYO do?

  Deep inside TOMOYO Linux

    https://osdn.jp/projects/tomoyo/docs/lca2009-kumaneko.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/lca2009-kumaneko.pdf

  The role of "pathname based access control" in security.

    https://osdn.jp/projects/tomoyo/docs/lfj2008-bof.pdf

    https://sourceforge.net/projects/tomoyo/files/docs/lfj2008-bof.pdf



History of TOMOYO?

  Realities of Mainlining

    https://osdn.jp/projects/tomoyo/docs/lfj2008.pdf



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

multiple LSM modules at the same time. We feel sorry that you have to give up

SELinux/SMACK/AppArmor etc. when you want to use TOMOYO.



We hope that LSM becomes stackable in future. Meanwhile, you can use non-LSM

version of TOMOYO, available at http://tomoyo.osdn.jp/1.8/ .

LSM version of TOMOYO is a subset of non-LSM version of TOMOYO. We are planning

to port non-LSM version's functionalities to LSM versions.
 
    https://sourceforge.net/projects/tomoyo/files/docs/lfj2008.pdf

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -22678,7 +22678,7 @@ L: tomoyo-users-en@lists.osdn.me (subscribers-only, for users in English) 
L:	tomoyo-dev@lists.osdn.me (subscribers-only, for developers in Japanese)

L:	tomoyo-users@lists.osdn.me (subscribers-only, for users in Japanese)

S:	Maintained

W:	https://tomoyo.osdn.jp/

W:	https://tomoyo.sourceforge.net/

F:	security/tomoyo/









TOPSTAR LAPTOP EXTRAS DRIVER

























security/tomoyo/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -10,7 +10,7 @@ config SECURITY_TOMOYO







	help









	  This selects TOMOYO Linux, pathname-based access control.









	  Required userspace tools and further information may be









	  found at <https://tomoyo.osdn.jp/>.









	  found at <https://tomoyo.sourceforge.net/>.









	  If you are unsure how to answer this question, answer N.



















config SECURITY_TOMOYO_MAX_ACCEPT_ENTRY
































security/tomoyo/common.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2787,7 +2787,7 @@ void tomoyo_check_profile(void)







		else









			continue;









		pr_err("Userland tools for TOMOYO 2.6 must be installed and policy must be initialized.\n");









		pr_err("Please see https://tomoyo.osdn.jp/2.6/ for more information.\n");









		pr_err("Please see https://tomoyo.sourceforge.net/2.6/ for more information.\n");









		panic("STOP!");









	}









	tomoyo_read_unlock(idx);