aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Jung Bauermann <bauerman@linux.ibm.com>2018-12-12 23:39:09 -0200
committerJames Morris <james.morris@microsoft.com>2018-12-17 14:09:39 -0800
commitc7f7e58fcbf33589f11bfde0506e076a00627e59 (patch)
treebe151412004f85b05366ffc572549ae440d977f7
parent5580b4a1a8ca85c53bd5b94c5d302e47dca3e5cb (diff)
downloadlinux-stericsson-c7f7e58fcbf33589f11bfde0506e076a00627e59.tar.gz
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>
-rw-r--r--security/integrity/digsig.c1
-rw-r--r--security/integrity/integrity.h5
2 files changed, 2 insertions, 4 deletions
diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index 71c3200521d6..f45d6edecf99 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 3517d2852a07..7de59f44cba3 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;