[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20181213013909.25737-1-bauerman@linux.ibm.com>
Date: Wed, 12 Dec 2018 23:39:09 -0200
From: Thiago Jung Bauermann <bauerman@...ux.ibm.com>
To: linux-security-module@...r.kernel.org
Cc: James Morris <jmorris@...ei.org>,
"Serge E. Hallyn" <serge@...lyn.com>,
Mimi Zohar <zohar@...ux.ibm.com>, linux-kernel@...r.kernel.org,
Thiago Jung Bauermann <bauerman@...ux.ibm.com>
Subject: [PATCH] integrity: Remove references to module keyring
>From what I can tell, it has never been used.
Signed-off-by: Thiago Jung Bauermann <bauerman@...ux.ibm.com>
---
security/integrity/digsig.c | 1 -
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 c5585e75d5d9..1ff8eab7bc8c 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 aafa1266e3d5..26c415c3f879 100644
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -152,9 +152,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;
Powered by blists - more mailing lists