From: Michal Suchanek Date: Thu, 7 Sep 2023 16:52:19 +0000 (+0200) Subject: integrity: powerpc: Do not select CA_MACHINE_KEYRING X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3edc22655647378dea01900f7b04e017ff96bda9;p=linux.git integrity: powerpc: Do not select CA_MACHINE_KEYRING No other platform needs CA_MACHINE_KEYRING, either. This is policy that should be decided by the administrator, not Kconfig dependencies. Cc: stable@vger.kernel.org # v6.6+ Fixes: d7d91c4743c4 ("integrity: PowerVM machine keyring enablement") Signed-off-by: Michal Suchanek Signed-off-by: Jarkko Sakkinen --- diff --git a/security/integrity/Kconfig b/security/integrity/Kconfig index 232191ee09e31..b6e074ac02273 100644 --- a/security/integrity/Kconfig +++ b/security/integrity/Kconfig @@ -68,8 +68,6 @@ config INTEGRITY_MACHINE_KEYRING depends on INTEGRITY_ASYMMETRIC_KEYS depends on SYSTEM_BLACKLIST_KEYRING depends on LOAD_UEFI_KEYS || LOAD_PPC_KEYS - select INTEGRITY_CA_MACHINE_KEYRING if LOAD_PPC_KEYS - select INTEGRITY_CA_MACHINE_KEYRING_MAX if LOAD_PPC_KEYS help If set, provide a keyring to which Machine Owner Keys (MOK) may be added. This keyring shall contain just MOK keys. Unlike keys