projects/linux·commit febf9ee3

Merge tag 'integrity-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

febf9ee3 · Linus Torvalds <[email protected]> · 2023-04-29 10:11:32 -07:00

Pull integrity update from Mimi Zohar:
 "Just one one bug fix. Other integrity changes are being upstreamed via
  the tpm and lsm trees"

* tag 'integrity-v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
  IMA: allow/fix UML builds
Commit
febf9ee3d2f37a772802fffb6e17c0e35a52e1f1
Parents
86e98ed1 · 644f1741

Merge commit. Changes below are compared with the first parent: 86e98ed1.

Changes

1 files changed · +1 −1

FileStatusAddDelContent
security/integrity/ima/Kconfigmodified+1−1View file

security/integrity/ima/Kconfig

View file
diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index 39caeca..60a511c 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -8,7 +8,7 @@ config IMA
select CRYPTO_HMAC
select CRYPTO_SHA1
select CRYPTO_HASH_INFO
- select TCG_TPM if HAS_IOMEM && !UML
+ select TCG_TPM if HAS_IOMEM
select TCG_TIS if TCG_TPM && X86
select TCG_CRB if TCG_TPM && ACPI
select TCG_IBMVTPM if TCG_TPM && PPC_PSERIES