Skip to contentSkip to conversation

ima: remove ACPI dependency

PATCH In review Mimi Zohar 2 participants 2 messages Oct 20, 2009 – Oct 25, 2009

Subsystems (4)
lore
Share & tools
lore

Mimi Zohar

author
#0 lore raw

PATCH 1/1 ima: remove ACPI dependency

Remove ACPI dependency on systems without a TPM enabled.

---
 security/integrity/ima/Kconfig |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
security/integrity/ima/Kconfig +7 -9
index 53d9764..3ca39e7 100644
@@ -2,14 +2,12 @@
 #
 config IMA
 	bool "Integrity Measurement Architecture(IMA)"
-	depends on ACPI
 	select SECURITYFS
 	select CRYPTO
 	select CRYPTO_HMAC
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
-	select TCG_TPM
-	select TCG_TIS
+	select ACPI if TCG_TPM
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity
 	  Measurement Architecture(IMA) maintains a list of hash
@@ -18,12 +16,12 @@ config IMA
 	  to change the contents of an important system file
 	  being measured, we can tell.
 
-	  If your system has a TPM chip, then IMA also maintains
-	  an aggregate integrity value over this list inside the
-	  TPM hardware, so that the TPM can prove to a third party
-	  whether or not critical system files have been modified.
-	  Read <http://www.usenix.org/events/sec04/tech/sailer.html>
-	  to learn more about IMA.
+	  If your system has a TPM chip, and it is enabled, then
+	  IMA also maintains an aggregate integrity value over
+	  this list inside the TPM hardware, so that the TPM can
+	  prove to a third party whether or not critical system
+	  files have been modified. To learn more about IMA, read
+	  <http://www.usenix.org/events/sec04/tech/sailer.html>
 	  If unsure, say N.
 
 config IMA_MEASURE_PCR_IDX
Signature · 1 line
1.6.0.6
Acked-by on v1 1/1
#1 lore raw

le mardi 20 octobre 2009 Mimi Zohar a écrit

Quoted 4 lines

Remove ACPI dependency on systems without a TPM enabled.

This patch requires that another patch is first applied (as reported by Mimi in the attached email).

Tested on top of 2.6.30 and 2.6.31 on armv5 platform (versatilePB) with both patches applied.

Quoted 33 lines
---
 security/integrity/ima/Kconfig |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
(quoted diff) +0 -0

b/security/integrity/ima/Kconfig index 53d9764..3ca39e7 100644

security/integrity/ima/Kconfig +1 -8
@@ -2,14 +2,12 @@
 #
 config IMA
 	bool "Integrity Measurement Architecture(IMA)"
-	depends on ACPI
 	select SECURITYFS
 	select CRYPTO
 	select CRYPTO_HMAC
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
-	select TCG_TPM
-	select TCG_TIS
+	select ACPI if TCG_TPM
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity
 	  Measurement Architecture(IMA) maintains a list of hash
@@ -18,12 +16,12 @@ config IMA
 	  to change the contents of an important system file
 	  being measured, we can tell.
 
-	  If your system has a TPM chip, then IMA also maintains
-	  an aggregate integrity value over this list inside the
-	  TPM hardware, so that the TPM can prove to a third party
-	  whether or not critical system files have been modified.
-	  Read <http://www.usenix.org/events/sec04/tech/sailer.html>

security/integrity/ima/Kconfig config IMA · line 27

Quoted 10 lines
security/integrity/ima/Kconfig +6 -1
-	  to learn more about IMA.
+	  If your system has a TPM chip, and it is enabled, then
+	  IMA also maintains an aggregate integrity value over
+	  this list inside the TPM hardware, so that the TPM can
+	  prove to a third party whether or not critical system
+	  files have been modified. To learn more about IMA, read
+	  <http://www.usenix.org/events/sec04/tech/sailer.html>
 	  If unsure, say N.
 
 config IMA_MEASURE_PCR_IDX

JC,

Sorry, this patch requires changes in the include/linux/tpm.h. Attached is a TPM patch.

Mimi

Quoted 55 lines · Mimi Zohar

JC,

It seems that James is waiting for an ACK or some type of acknowledgement from you. Would you mind giving it a try?

Thanks!

Mimi

-------- Forwarded Message --------
From: Mimi Zohar <[email protected]>
To: [email protected]
Cc: Mimi Zohar <[email protected]>, Jean-Christophe Dubois <[email protected]>, James Morris <[email protected]>, David Safford <[email protected]>, Mimi Zohar <[email protected]>
Subject: [PATCH] ima: remove ACPI dependency
Date: Tue, 20 Oct 2009 16:12:38 -0400

Remove ACPI dependency on systems without a TPM enabled.

---
 security/integrity/ima/Kconfig |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
security/integrity/ima/Kconfig +1 -8
index 53d9764..3ca39e7 100644
@@ -2,14 +2,12 @@
 #
 config IMA
 	bool "Integrity Measurement Architecture(IMA)"
-	depends on ACPI
 	select SECURITYFS
 	select CRYPTO
 	select CRYPTO_HMAC
 	select CRYPTO_MD5
 	select CRYPTO_SHA1
-	select TCG_TPM
-	select TCG_TIS
+	select ACPI if TCG_TPM
 	help
 	  The Trusted Computing Group(TCG) runtime Integrity
 	  Measurement Architecture(IMA) maintains a list of hash
@@ -18,12 +16,12 @@ config IMA
 	  to change the contents of an important system file
 	  being measured, we can tell.
 
-	  If your system has a TPM chip, then IMA also maintains
-	  an aggregate integrity value over this list inside the
-	  TPM hardware, so that the TPM can prove to a third party
-	  whether or not critical system files have been modified.
-	  Read <http://www.usenix.org/events/sec04/tech/sailer.html>

security/integrity/ima/Kconfig config IMA · line 27

Quoted 10 lines
security/integrity/ima/Kconfig +6 -1
-	  to learn more about IMA.
+	  If your system has a TPM chip, and it is enabled, then
+	  IMA also maintains an aggregate integrity value over
+	  this list inside the TPM hardware, so that the TPM can
+	  prove to a third party whether or not critical system
+	  files have been modified. To learn more about IMA, read
+	  <http://www.usenix.org/events/sec04/tech/sailer.html>
 	  If unsure, say N.
 
 config IMA_MEASURE_PCR_IDX

tpm add default function definitions

Add default tpm_pcr_read/extend function definitions required by IMA/Kconfig changes.

include/linux/tpm.h +7 -0
Index: security-testing-2.6/include/linux/tpm.h
===================================================================
@@ -31,5 +31,12 @@
 
 extern int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf);
 extern int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash);
+#else
+static inline int tpm_pcr_read(u32 chip_num, int pcr_idx, u8 *res_buf) {
+	return -ENODEV;
+}
+static inline int tpm_pcr_extend(u32 chip_num, int pcr_idx, const u8 *hash) {
+	return -ENODEV;
+}
 #endif
 #endif