Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-29 23:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makefile and Kconfig updates for TOMOYO.

Browse Source 
security/tomoyo/Kconfig  |    4 +---
  security/tomoyo/Makefile |   19 +++++++++++--------
  2 files changed, 12 insertions(+), 11 deletions(-)
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJjxn6RAAoJEEJfEo0MZPUqh4cQAMRG2/5m/CSk8dYL38fA5C3N
 CJQJeBeB5EVGY8mcRs8LxWIFqBxWoLuD5wthff+MhK3v/lp2T4PniiEWx/6wMpmB
 Zg8V03r+gtMaL76x+kXB6lcXshNPxYh3joPkZCjB1Rh8jiHE8Dd3kJMR/FrsDdfb
 +pLcDwX4ok1UHx4olIwQGUFVg0X50xA/IvugBamiNfm+MkKmhUea3vODXoOXbhsL
 UYyDyravLVPS0Hlv8nUngwErdNJD9gUqMcwDB+gZwvUht4xxFQ5WEJSTwGM2fiPS
 FVnd13Na20SEMMgYDTjhqI9iSfgdY2IVk5Cc738nVbgusUP+pEPthle6DNFmYTMo
 QwPIEOyEmxVkiWzhAVvk8CHHsJzelBVh/2rsYAbnC0DDiHsGj/OWuQPe1dMPToi/
 pjOQMbewrOWWk0l2u3Sz/2cGVRYb8Nuh2I1ExC2wEygP7hXs9gyI6P6vdEI7p3ij
 LYzjf9zKCOl81/Q1x3SWZRVxx+WYTtUIAGY1RPxs9K6kwU/PVerIUKZZXzP6xGro
 /t+XZd/oKxJIFMPelu+WGFjPgQjAkYxNAzXEyXwNBoZxKeiQvMEFoM4YcKw00I3j
 izCBZY4BHtivDP8UTrI9Xserk+ti+6Mpx91O3sh9hhfJTUENA77rWt4UCuaOZZ9e
 QNwm93QVBfoVcQ+eZn8X
 =80eA
 -----END PGP SIGNATURE-----

Merge tag 'tomoyo-pr-20230117' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1

Pull tomoyo fixes from Tetsuo Handa:
 "Makefile and Kconfig updates for TOMOYO"

* tag 'tomoyo-pr-20230117' of git://git.osdn.net/gitroot/tomoyo/tomoyo-test1:
  tomoyo: Update website link
  tomoyo: Remove "select SRCU"
  tomoyo: Omit use of bin2c
  tomoyo: avoid unneeded creation of builtin-policy.h
  tomoyo: fix broken dependency on *.conf.default
This commit is contained in:
Linus Torvalds 2023-01-17 09:20:50 -08:00
commit 2bbb0674c9
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/tomoyo/Kconfig
View File

@ -6,13 +6,11 @@ config SECURITY_TOMOYO
select SECURITYFS
select SECURITY_PATH
select SECURITY_NETWORK
select SRCU
select BUILD_BIN2C
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/>.
found at <https://tomoyo.osdn.jp/>.
If you are unsure how to answer this question, answer N.
config SECURITY_TOMOYO_MAX_ACCEPT_ENTRY

19
security/tomoyo/Makefile
View File

@ -2,15 +2,18 @@
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
targets += builtin-policy.h
define do_policy
echo "static char tomoyo_builtin_$(1)[] __initdata ="; \
$(objtree)/scripts/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
quiet_cmd_policy = POLICY $@
cmd_policy = { \
$(foreach x, profile exception_policy domain_policy manager stat, \
printf 'static char tomoyo_builtin_$x[] __initdata =\n'; \
sed -e 's/\\/\\\\/g' -e 's/\"/\\"/g' -e 's/\(.*\)/\t"\1\\n"/' -- $(firstword $(filter %/$x.conf %/$x.conf.default, $^) /dev/null); \
printf '\t"";\n';) \
} > $@
$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(srctree)/$(src)/policy/*.conf.default) FORCE
$(call if_changed,policy)
ifndef CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING
$(obj)/common.o: $(obj)/builtin-policy.h
endif