From: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Date: Thu, 13 Dec 2018 01:39:09 +0000 (-0200)
Subject: integrity: Remove references to module keyring
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c7f7e58fcbf33589f11bfde0506e076a00627e59;p=linux.git

integrity: Remove references to module keyring

From what I can tell, it has never been used.

Mimi: This was introduced prior to Rusty's decision to use appended
signatures for kernel modules.

Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Acked-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: James Morris <james.morris@microsoft.com>
---

diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index 71c3200521d66..f45d6edecf99a 100644
--- a/security/integrity/digsig.c
+++ b/security/integrity/digsig.c
@@ -34,7 +34,6 @@ static const char * const keyring_name[INTEGRITY_KEYRING_MAX] = {
 	".evm",
 	".ima",
 #endif
-	"_module",
 	".platform",
 };
 
diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
index 3517d2852a07a..7de59f44cba3b 100644
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -141,9 +141,8 @@ int integrity_kernel_read(struct file *file, loff_t offset,
 
 #define INTEGRITY_KEYRING_EVM		0
 #define INTEGRITY_KEYRING_IMA		1
-#define INTEGRITY_KEYRING_MODULE	2
-#define INTEGRITY_KEYRING_PLATFORM	3
-#define INTEGRITY_KEYRING_MAX		4
+#define INTEGRITY_KEYRING_PLATFORM	2
+#define INTEGRITY_KEYRING_MAX		3
 
 extern struct dentry *integrity_dir;