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

Commit 3add594b authored by James Morris's avatar James Morris
Browse files

Merge branch 'tomoyo-cleanup' of... 

Merge branch 'tomoyo-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild into next
parents cf7b6c02 f02dee2d

security/tomoyo/.gitignore

+1 −1
Original line number Diff line number Diff line 
builtin-policy.h

policy/
 
policy/*.conf

security/tomoyo/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ config SECURITY_TOMOYO 
	select SECURITY_PATH

	select SECURITY_NETWORK

	select SRCU

	select BUILD_BIN2C

	default n

	help

	  This selects TOMOYO Linux, pathname-based access control.

security/tomoyo/Makefile

+11 −44
Original line number Diff line number Diff line 
obj-y = audit.o common.o condition.o domain.o environ.o file.o gc.o group.o load_policy.o memory.o mount.o network.o realpath.o securityfs_if.o tomoyo.o util.o



$(obj)/policy/profile.conf:

	@mkdir -p $(obj)/policy/

	@echo Creating an empty policy/profile.conf

	@touch $@



$(obj)/policy/exception_policy.conf:

	@mkdir -p $(obj)/policy/

	@echo Creating a default policy/exception_policy.conf

	@echo initialize_domain /sbin/modprobe from any >> $@

	@echo initialize_domain /sbin/hotplug from any >> $@



$(obj)/policy/domain_policy.conf:

	@mkdir -p $(obj)/policy/

	@echo Creating an empty policy/domain_policy.conf

	@touch $@



$(obj)/policy/manager.conf:

	@mkdir -p $(obj)/policy/

	@echo Creating an empty policy/manager.conf

	@touch $@



$(obj)/policy/stat.conf:

	@mkdir -p $(obj)/policy/

	@echo Creating an empty policy/stat.conf

	@touch $@



$(obj)/builtin-policy.h: $(obj)/policy/profile.conf $(obj)/policy/exception_policy.conf $(obj)/policy/domain_policy.conf $(obj)/policy/manager.conf $(obj)/policy/stat.conf

	@echo Generating built-in policy for TOMOYO 2.5.x.

	@echo "static char tomoyo_builtin_profile[] __initdata =" > $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/profile.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@echo "static char tomoyo_builtin_exception_policy[] __initdata =" >> $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/exception_policy.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@echo "static char tomoyo_builtin_domain_policy[] __initdata =" >> $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/domain_policy.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@echo "static char tomoyo_builtin_manager[] __initdata =" >> $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/manager.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@echo "static char tomoyo_builtin_stat[] __initdata =" >> $@.tmp

	@sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/"\1\\n"/' < $(obj)/policy/stat.conf >> $@.tmp

	@echo "\"\";" >> $@.tmp

	@mv $@.tmp $@

targets += builtin-policy.h

define do_policy

echo "static char tomoyo_builtin_$(1)[] __initdata ="; \

$(objtree)/scripts/basic/bin2c <$(firstword $(wildcard $(obj)/policy/$(1).conf $(srctree)/$(src)/policy/$(1).conf.default) /dev/null); \

echo ";"

endef

quiet_cmd_policy  = POLICY  $@

      cmd_policy  = ($(call do_policy,profile); $(call do_policy,exception_policy); $(call do_policy,domain_policy); $(call do_policy,manager); $(call do_policy,stat)) >$@



$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(src)/policy/*.conf.default) FORCE

	$(call if_changed,policy)



$(obj)/common.o: $(obj)/builtin-policy.h

security/tomoyo/policy/exception_policy.conf.default

0 → 100644
+2 −0
Original line number Diff line number Diff line 
initialize_domain /sbin/modprobe from any

initialize_domain /sbin/hotplug from any