linux-stable/security/integrity
Arnd Bergmann 98bd9c02c2 ima: rework CONFIG_IMA dependency block
[ Upstream commit 91e326563e ]

Changing the direct dependencies of IMA_BLACKLIST_KEYRING and
IMA_LOAD_X509 caused them to no longer depend on IMA, but a
a configuration without IMA results in link failures:

arm-linux-gnueabi-ld: security/integrity/iint.o: in function `integrity_load_keys':
iint.c:(.init.text+0xd8): undefined reference to `ima_load_x509'

aarch64-linux-ld: security/integrity/digsig_asymmetric.o: in function `asymmetric_verify':
digsig_asymmetric.c:(.text+0x104): undefined reference to `ima_blacklist_keyring'

Adding explicit dependencies on IMA would fix this, but a more reliable
way to do this is to enclose the entire Kconfig file in an 'if IMA' block.
This also allows removing the existing direct dependencies.

Fixes: be210c6d35 ("ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2023-10-10 22:03:01 +02:00
..
evm evm: Fix build warnings 2023-06-06 08:51:11 -04:00
ima ima: rework CONFIG_IMA dependency block 2023-10-10 22:03:01 +02:00
platform_certs security/integrity: fix pointer to ESL data and its size on pseries 2023-06-21 14:08:53 +10:00
digsig.c integrity: machine keyring CA configuration 2023-04-24 16:15:53 +03:00
digsig_asymmetric.c ima: fix reference leak in asymmetric_verify() 2022-01-24 18:37:36 -05:00
iint.c integrity: Fix possible multiple allocation in integrity_inode_get() 2023-06-01 07:25:04 -04:00
integrity.h ima: support fs-verity file digest based version 3 signatures 2022-05-05 17:41:51 -04:00
integrity_audit.c integrity: check the return value of audit_log_start() 2022-02-02 11:44:23 -05:00
Kconfig integrity: machine keyring CA configuration 2023-04-24 16:15:53 +03:00
Makefile integrity: Introduce a Linux keyring called machine 2022-03-08 13:55:52 +02:00