Skip to contentSkip to conversation

EVM: add some debugging info

PATCH In review Mimi Zohar 2 participants 4 messages Jun 8, 2021

Subsystems (4)
lore
Share & tools
lore

Mimi Zohar

author maintainer
#0 lore raw

cover EVM: add some debugging info

With the recent EVM portable & immutable signature usability improvements and the ability of including the EVM portable signatures in the IMA measurement list, adding some dynamic debugging information - security xattrs and file metadata (misc info) - would be useful.

Mimi Zohar (2):
ima: differentiate between EVM failures in the audit log
evm: output EVM digest calculation info

 security/integrity/evm/evm_crypto.c   | 42 +++++++++++++++++++++++++++
 security/integrity/evm/evm_main.c     |  4 +++
 security/integrity/ima/ima_appraise.c |  3 +-
 3 files changed, 48 insertions(+), 1 deletion(-)
Signature · 1 line
2.27.0
author maintainer
#1 lore raw

PATCH 1/2 ima: differentiate between EVM failures in the audit log

Differentiate between an invalid EVM portable signature failure from other EVM HMAC/signature failures.

---
 security/integrity/ima/ima_appraise.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
security/integrity/ima/ima_appraise.c +2 -1
index 940695e7b535..ef9dcfce45d4 100644
@@ -422,7 +422,8 @@ int ima_appraise_measurement(enum ima_hooks func,
 		goto out;
 	case INTEGRITY_FAIL_IMMUTABLE:
 		set_bit(IMA_DIGSIG, &iint->atomic_flags);
-		fallthrough;
+		cause = "invalid-fail-immutable";
+		goto out;
 	case INTEGRITY_FAIL:		/* Invalid HMAC/signature. */
 		cause = "invalid-HMAC";
 		goto out;
Signature · 1 line
2.27.0
author maintainer
#2 lore raw

PATCH 2/2 evm: output EVM digest calculation info

In reply to Mimi Zohar

Output the data used in calculating the EVM digest and the resulting digest as ascii hexadecimal strings.

---
Changelog:
- Use pr_debug *phN format
- Define dump_security_xattr() for larger binary data
- Based on CONFIG_DYNAMIC_DEBUG

 security/integrity/evm/evm_crypto.c | 42 +++++++++++++++++++++++++++++
 security/integrity/evm/evm_main.c   |  4 +++
 2 files changed, 46 insertions(+)
security/integrity/evm/evm_crypto.c +42 -0
index 1628e2ca9862..900cf8a157b6 100644
@@ -10,6 +10,8 @@
  *	 Using root's kernel master key (kmk), calculate the HMAC
  */
 
+#define pr_fmt(fmt) "EVM: "fmt
+
 #include <linux/export.h>
 #include <linux/crypto.h>
 #include <linux/xattr.h>
@@ -175,6 +177,29 @@ static void hmac_add_misc(struct shash_desc *desc, struct inode *inode,
 	    type != EVM_XATTR_PORTABLE_DIGSIG)
 		crypto_shash_update(desc, (u8 *)&inode->i_sb->s_uuid, UUID_SIZE);
 	crypto_shash_final(desc, digest);
+
+	pr_debug("hmac_misc: (%lu) [%*phN]\n", sizeof(struct h_misc),
+		 (int) sizeof(struct h_misc), &hmac_misc);
+}
+
+/*
+ * Dump large security xattr values as a continuous ascii hexademical string.
+ * (pr_debug is limited to 64 bytes.)
+ */
+static void dump_security_xattr(const char *prefix, const void *src, size_t count)
+{
+#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
+	char *asciihex, *p;
+
+	p = asciihex = kmalloc(count * 2 + 1, GFP_KERNEL);
+	if (!asciihex)
+		return;
+
+	p = bin2hex(p, src, count);
+	*p = 0;
+	pr_debug("%s: (%lu) %.*s\n", prefix, count, (int) count * 2, asciihex);
+	kfree(asciihex);
+#endif
 }
 
 /*
@@ -230,6 +255,16 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
 					     req_xattr_value_len);
 			if (is_ima)
 				ima_present = true;
+
+			if (req_xattr_value_len < 64)
+				pr_debug("%s: (%lu) [%*phN]\n", req_xattr_name,
+					 req_xattr_value_len,
+					 (int)req_xattr_value_len,
+					 req_xattr_value);
+			else
+				dump_security_xattr(req_xattr_name,
+						    req_xattr_value,
+						    req_xattr_value_len);
 			continue;
 		}
 		size = vfs_getxattr_alloc(&init_user_ns, dentry, xattr->name,
@@ -246,6 +281,13 @@ static int evm_calc_hmac_or_hash(struct dentry *dentry,
 		crypto_shash_update(desc, (const u8 *)xattr_value, xattr_size);
 		if (is_ima)
 			ima_present = true;
+
+		if (xattr_size < 64)
+			pr_debug("%s: (%lu) [%*phN]", xattr->name, xattr_size,
+				 (int)xattr_size, xattr_value);
+		else
+			dump_security_xattr(xattr->name, xattr_value,
+					    xattr_size);
 	}
 	hmac_add_misc(desc, inode, type, data->digest);
 
security/integrity/evm/evm_main.c +4 -0
index 2c226e634ae9..059ac17a0041 100644
@@ -11,6 +11,8 @@
  *	evm_inode_removexattr, and evm_verifyxattr
  */
 
+#define pr_fmt(fmt) "EVM: "fmt
+
 #include <linux/init.h>
 #include <linux/crypto.h>
 #include <linux/audit.h>
@@ -272,6 +274,8 @@ static enum integrity_status evm_verify_hmac(struct dentry *dentry,
 		else
 			evm_status = INTEGRITY_FAIL;
 	}
+	pr_debug("digest: (%d) [%*phN]\n", digest.hdr.length, digest.hdr.length,
+		  digest.digest);
 out:
 	if (iint)
 		iint->evm_status = evm_status;
Signature · 1 line
2.27.0
Reviewed-by on v1 2/2
#3 lore raw

Re: [PATCH 2/2] evm: output EVM digest calculation info

Quoted 2 lines · Mimi Zohar

Output the data used in calculating the EVM digest and the resulting digest as ascii hexadecimal strings.

Quoted 127 lines

(CONFIG_DYNAMIC_DEBUG)

---
Changelog:
- Use pr_debug *phN format
- Define dump_security_xattr() for larger binary data
- Based on CONFIG_DYNAMIC_DEBUG

 security/integrity/evm/evm_crypto.c | 42
+++++++++++++++++++++++++++++
 security/integrity/evm/evm_main.c   |  4 +++
 2 files changed, 46 insertions(+)
security/integrity/evm/evm_crypto.c +9 -0
index 1628e2ca9862..900cf8a157b6 100644
@@ -10,6 +10,8 @@
  *	 Using root's kernel master key (kmk), calculate the HMAC
  */
 
+#define pr_fmt(fmt) "EVM: "fmt
+
 #include <linux/export.h>
 #include <linux/crypto.h>
 #include <linux/xattr.h>
@@ -175,6 +177,29 @@ static void hmac_add_misc(struct shash_desc
 *desc, struct inode *inode,
 	    type != EVM_XATTR_PORTABLE_DIGSIG)
 		crypto_shash_update(desc, (u8 *)&inode->i_sb->s_uuid,
 UUID_SIZE);
 	crypto_shash_final(desc, digest);
+
+	pr_debug("hmac_misc: (%lu) [%*phN]\n", sizeof(struct h_misc),
+		 (int) sizeof(struct h_misc), &hmac_misc);
+}
+
+/*
+ * Dump large security xattr values as a continuous ascii

hexademical string.
+ * (pr_debug is limited to 64 bytes.)
+ */
+static void dump_security_xattr(const char *prefix, const void *src, size_t count)

security/integrity/evm/evm_crypto.c +11 -0
+{
+#if defined(DEBUG) || defined(CONFIG_DYNAMIC_DEBUG)
+	char *asciihex, *p;
+
+	p = asciihex = kmalloc(count * 2 + 1, GFP_KERNEL);
+	if (!asciihex)
+		return;
+
+	p = bin2hex(p, src, count);
+	*p = 0;
+	pr_debug("%s: (%lu) %.*s\n", prefix, count, (int) count * 2,

asciihex);

security/integrity/evm/evm_crypto.c +12 -0
+	kfree(asciihex);
+#endif
 }
 
 /*
@@ -230,6 +255,16 @@ static int evm_calc_hmac_or_hash(struct dentry
 *dentry,
 					     req_xattr_value_len);
 			if (is_ima)
 				ima_present = true;
+
+			if (req_xattr_value_len < 64)
+				pr_debug("%s: (%lu) [%*phN]\n",
 req_xattr_name,
+					 req_xattr_value_len,
+					 (int)req_xattr_value_len,
+					 req_xattr_value);
+			else
+				dump_security_xattr(req_xattr_name,
+						    req_xattr_value,
+						    req_xattr_value_len
 );
security/integrity/evm/evm_crypto.c +0 -0
 			continue;
 		}
 		size = vfs_getxattr_alloc(&init_user_ns, dentry, xattr-
Quoted 1 line

name,

security/integrity/evm/evm_crypto.c +7 -0
@@ -246,6 +281,13 @@ static int evm_calc_hmac_or_hash(struct dentry
 *dentry,
 		crypto_shash_update(desc, (const u8 *)xattr_value,
 xattr_size);
 		if (is_ima)
 			ima_present = true;
+
+		if (xattr_size < 64)
+			pr_debug("%s: (%lu) [%*phN]", xattr->name,
 xattr_size,
+				 (int)xattr_size, xattr_value);
+		else
+			dump_security_xattr(xattr->name, xattr_value,
+					    xattr_size);
security/integrity/evm/evm_crypto.c +0 -0
 	}
 	hmac_add_misc(desc, inode, type, data->digest);
security/integrity/evm/evm_main.c +4 -0
index 2c226e634ae9..059ac17a0041 100644
@@ -11,6 +11,8 @@
  *	evm_inode_removexattr, and evm_verifyxattr
  */
 
+#define pr_fmt(fmt) "EVM: "fmt
+
 #include <linux/init.h>
 #include <linux/crypto.h>
 #include <linux/audit.h>
@@ -272,6 +274,8 @@ static enum integrity_status
 evm_verify_hmac(struct dentry *dentry,
 		else
 			evm_status = INTEGRITY_FAIL;
 	}
+	pr_debug("digest: (%d) [%*phN]\n", digest.hdr.length,
 digest.hdr.length,
+		  digest.digest);
 out:
security/integrity/evm/evm_main.c +0 -0
 	if (iint)
 		iint->evm_status = evm_status;