Skip to contentSkip to conversation

ima: remove ACPI dependency

PATCH In review Mimi Zohar 2 participants 4 messages May 4, 2010 – May 16, 2010

Subsystems (3)
lore
Share & tools
lore

Mimi Zohar

author
#0 lore raw

PATCH 1/1 ima: remove ACPI dependency

The ACPI dependency moved to the TPM, where it belongs. Although IMA per-se does not require access to the bios measurement log, verifying the IMA boot aggregate does, which requires ACPI.

This patch prereq's 'TPM: ACPI/PNP dependency removal'
http://lkml.org/lkml/2010/5/4/378.

---
 security/integrity/ima/Kconfig |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
security/integrity/ima/Kconfig +2 -3
index 3d7846d..b6ecfd4 100644
@@ -2,15 +2,14 @@
 #
 config IMA
 	bool "Integrity Measurement Architecture(IMA)"
-	depends on ACPI
 	depends on SECURITY
 	select SECURITYFS
 	select CRYPTO
 	select CRYPTO_HMAC
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
-	select TCG_TPM
-	select TCG_TIS
+	select TCG_TPM if !S390
+	select TCG_TIS if TCG_TPM
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity
 	  Measurement Architecture(IMA) maintains a list of hash
Signature · 1 line
1.6.6.1
maintainer
#1 lore raw
Quoted 11 lines · Mimi Zohar

The ACPI dependency moved to the TPM, where it belongs. Although IMA per-se does not require access to the bios measurement log, verifying the IMA boot aggregate does, which requires ACPI.

This patch prereq's 'TPM: ACPI/PNP dependency removal'
http://lkml.org/lkml/2010/5/4/378.

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

Signature · 2 lines
James Morris
<[email protected]>
author
#2 lore raw
In reply to Mimi Zohar

Once the 'TPM: ACPI/PNP dependency removal' patch is accepted
http://lkml.org/lkml/2010/5/13/410, please accept this previously posted patch (with either updating the prereq URL or removing it.)

thanks,

Mimi

Quoted 37 lines · Mimi Zohar

The ACPI dependency moved to the TPM, where it belongs. Although IMA per-se does not require access to the bios measurement log, verifying the IMA boot aggregate does, which requires ACPI.

This patch prereq's 'TPM: ACPI/PNP dependency removal'
http://lkml.org/lkml/2010/5/4/378.

---
 security/integrity/ima/Kconfig |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
security/integrity/ima/Kconfig +2 -3
index 3d7846d..b6ecfd4 100644
@@ -2,15 +2,14 @@
 #
 config IMA
 	bool "Integrity Measurement Architecture(IMA)"
-	depends on ACPI
 	depends on SECURITY
 	select SECURITYFS
 	select CRYPTO
 	select CRYPTO_HMAC
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
-	select TCG_TPM
-	select TCG_TIS
+	select TCG_TPM if !S390
+	select TCG_TIS if TCG_TPM
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity
 	  Measurement Architecture(IMA) maintains a list of hash
maintainer
#3 lore raw
Quoted 4 lines · Mimi Zohar

Once the 'TPM: ACPI/PNP dependency removal' patch is accepted
http://lkml.org/lkml/2010/5/13/410, please accept this previously posted patch (with either updating the prereq URL or removing it.)

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next

Quoted 41 lines · Mimi Zohar
Quoted 37 lines

The ACPI dependency moved to the TPM, where it belongs. Although IMA per-se does not require access to the bios measurement log, verifying the IMA boot aggregate does, which requires ACPI.

This patch prereq's 'TPM: ACPI/PNP dependency removal'
http://lkml.org/lkml/2010/5/4/378.

---
 security/integrity/ima/Kconfig |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
security/integrity/ima/Kconfig +2 -3
index 3d7846d..b6ecfd4 100644
@@ -2,15 +2,14 @@
 #
 config IMA
 	bool "Integrity Measurement Architecture(IMA)"
-	depends on ACPI
 	depends on SECURITY
 	select SECURITYFS
 	select CRYPTO
 	select CRYPTO_HMAC
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
-	select TCG_TPM
-	select TCG_TIS
+	select TCG_TPM if !S390
+	select TCG_TIS if TCG_TPM
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity
 	  Measurement Architecture(IMA) maintains a list of hash
Signature · 2 lines
James Morris
<[email protected]>