Commit 42d5aaa2 authored by James Morris's avatar James Morris
Browse files

security: change link order of LSMs so security=tomoyo works 



LSMs need to be linked before root_plug to ensure the security=
boot parameter works with them.  Do this for Tomoyo.

(root_plug probably needs to be taken out and shot at some point,
too).

Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent d74db3b2

security/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ obj-$(CONFIG_SECURITYFS) += inode.o 
# Must precede capability.o in order to stack properly.

obj-$(CONFIG_SECURITY_SELINUX)		+= selinux/built-in.o

obj-$(CONFIG_SECURITY_SMACK)		+= smack/built-in.o

obj-$(CONFIG_SECURITY_TOMOYO)		+= tomoyo/built-in.o

obj-$(CONFIG_SECURITY_ROOTPLUG)		+= root_plug.o

obj-$(CONFIG_CGROUP_DEVICE)		+= device_cgroup.o

obj-$(CONFIG_SECURITY_TOMOYO)		+= tomoyo/built-in.o



# Object integrity file lists

subdir-$(CONFIG_IMA)			+= integrity/ima