diff options
author | Thiago Jung Bauermann <bauerman@linux.ibm.com> | 2018-12-12 20:39:09 -0500 |
---|---|---|
committer | James Morris <james.morris@microsoft.com> | 2018-12-17 17:09:39 -0500 |
commit | c7f7e58fcbf33589f11bfde0506e076a00627e59 (patch) | |
tree | be151412004f85b05366ffc572549ae440d977f7 | |
parent | 5580b4a1a8ca85c53bd5b94c5d302e47dca3e5cb (diff) |
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.c | 1 | ||||
-rw-r--r-- | security/integrity/integrity.h | 5 |
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] = { | |||
34 | ".evm", | 34 | ".evm", |
35 | ".ima", | 35 | ".ima", |
36 | #endif | 36 | #endif |
37 | "_module", | ||
38 | ".platform", | 37 | ".platform", |
39 | }; | 38 | }; |
40 | 39 | ||
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, | |||
141 | 141 | ||
142 | #define INTEGRITY_KEYRING_EVM 0 | 142 | #define INTEGRITY_KEYRING_EVM 0 |
143 | #define INTEGRITY_KEYRING_IMA 1 | 143 | #define INTEGRITY_KEYRING_IMA 1 |
144 | #define INTEGRITY_KEYRING_MODULE 2 | 144 | #define INTEGRITY_KEYRING_PLATFORM 2 |
145 | #define INTEGRITY_KEYRING_PLATFORM 3 | 145 | #define INTEGRITY_KEYRING_MAX 3 |
146 | #define INTEGRITY_KEYRING_MAX 4 | ||
147 | 146 | ||
148 | extern struct dentry *integrity_dir; | 147 | extern struct dentry *integrity_dir; |
149 | 148 | ||