| 修订版 | 2bbb0674c93f9373f12048786b4638b055243112 (tree) |
|---|---|
| 时间 | 2023-01-18 02:20:50 |
| 作者 | Linus Torvalds <torvalds@linu...> |
| Commiter | Linus Torvalds |
Merge tag 'tomoyo-pr-20230117' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1
Pull tomoyo fixes from Tetsuo Handa:
* tag 'tomoyo-pr-20230117' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1:
security/tomoyo/Kconfig (diff) security/tomoyo/Makefile (diff)| @@ -6,13 +6,11 @@ config SECURITY_TOMOYO | ||
| 6 | 6 | select SECURITYFS |
| 7 | 7 | select SECURITY_PATH |
| 8 | 8 | select SECURITY_NETWORK |
| 9 | - select SRCU | |
| 10 | - select BUILD_BIN2C | |
| 11 | 9 | default n |
| 12 | 10 | help |
| 13 | 11 | This selects TOMOYO Linux, pathname-based access control. |
| 14 | 12 | Required userspace tools and further information may be |
| 15 | - found at <http://tomoyo.sourceforge.jp/>. | |
| 13 | + found at <https://tomoyo.osdn.jp/>. | |
| 16 | 14 | If you are unsure how to answer this question, answer N. |
| 17 | 15 | |
| 18 | 16 | config SECURITY_TOMOYO_MAX_ACCEPT_ENTRY |
| @@ -2,15 +2,18 @@ | ||
| 2 | 2 | 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 |
| 3 | 3 | |
| 4 | 4 | targets += builtin-policy.h |
| 5 | -define do_policy | |
| 6 | -echo "static char tomoyo_builtin_$(1)[] __initdata ="; \ | |
| 7 | -$(objtree)/scripts/bin2c <$(firstword $(wildcard $(obj)/policy/$(1).conf $(srctree)/$(src)/policy/$(1).conf.default) /dev/null); \ | |
| 8 | -echo ";" | |
| 9 | -endef | |
| 10 | -quiet_cmd_policy = POLICY $@ | |
| 11 | - cmd_policy = ($(call do_policy,profile); $(call do_policy,exception_policy); $(call do_policy,domain_policy); $(call do_policy,manager); $(call do_policy,stat)) >$@ | |
| 12 | 5 | |
| 13 | -$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(src)/policy/*.conf.default) FORCE | |
| 6 | +quiet_cmd_policy = POLICY $@ | |
| 7 | + cmd_policy = { \ | |
| 8 | + $(foreach x, profile exception_policy domain_policy manager stat, \ | |
| 9 | + printf 'static char tomoyo_builtin_$x[] __initdata =\n'; \ | |
| 10 | + sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/\t"\1\\n"/' -- $(firstword $(filter %/$x.conf %/$x.conf.default, $^) /dev/null); \ | |
| 11 | + printf '\t"";\n';) \ | |
| 12 | + } > $@ | |
| 13 | + | |
| 14 | +$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(srctree)/$(src)/policy/*.conf.default) FORCE | |
| 14 | 15 | $(call if_changed,policy) |
| 15 | 16 | |
| 17 | +ifndef CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING | |
| 16 | 18 | $(obj)/common.o: $(obj)/builtin-policy.h |
| 19 | +endif |
TOMOYO
Fork