Signed-off-by: Kentaro Takeda <takedakn@xxxxxxxxxxxxx> Signed-off-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx> --- security/Kconfig | 1 + security/Makefile | 2 ++ security/tomoyo/Kconfig | 9 +++++++++ security/tomoyo/Makefile | 1 + 4 files changed, 13 insertions(+) --- mm.orig/security/Kconfig +++ mm/security/Kconfig @@ -124,6 +124,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR source security/selinux/Kconfig source security/smack/Kconfig +source security/tomoyo/Kconfig endmenu --- mm.orig/security/Makefile +++ mm/security/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_KEYS) += keys/ subdir-$(CONFIG_SECURITY_SELINUX) += selinux subdir-$(CONFIG_SECURITY_SMACK) += smack +subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo # if we don't select a security model, use the default capabilities ifneq ($(CONFIG_SECURITY),y) @@ -16,6 +17,7 @@ obj-$(CONFIG_SECURITY) += security.o d # Must precede capability.o in order to stack properly. obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o obj-$(CONFIG_SECURITY_SMACK) += commoncap.o smack/built-in.o +obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o --- /dev/null +++ mm/security/tomoyo/Kconfig @@ -0,0 +1,9 @@ +config SECURITY_TOMOYO + bool "TOMOYO Linux Support" + depends on SECURITY + default n + help + This selects TOMOYO Linux, pathname-based access control. + Required userspace tools and further information may be + found at <http://tomoyo.sourceforge.jp/>. + If you are unsure how to answer this question, answer N. --- /dev/null +++ mm/security/tomoyo/Makefile @@ -0,0 +1 @@ +obj-y = common.o realpath.o tomoyo.o domain.o file.o -- -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
