From: Thiago Jung Bauermann <bauerman@linux.ibm.com>
To: linux-security-module@vger.kernel.org
Cc: James Morris <jmorris@namei.org>,
"Serge E. Hallyn" <serge@hallyn.com>,
Mimi Zohar <zohar@linux.ibm.com>,
linux-kernel@vger.kernel.org,
Thiago Jung Bauermann <bauerman@linux.ibm.com>
Subject: [PATCH] integrity: Remove references to module keyring
Date: Wed, 12 Dec 2018 23:39:09 -0200 [thread overview]
Message-ID: <20181213013909.25737-1-bauerman@linux.ibm.com> (raw)
From what I can tell, it has never been used.
Signed-off-by: Thiago Jung Bauermann <bauerman@linux.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;
next reply other threads:[~2018-12-13 1:42 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 1:39 Thiago Jung Bauermann [this message]
2018-12-17 19:33 ` [PATCH] integrity: Remove references to module keyring James Morris
2018-12-17 20:03 ` Mimi Zohar
2018-12-17 22:11 ` James Morris
2018-12-17 22:37 ` Thiago Jung Bauermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181213013909.25737-1-bauerman@linux.ibm.com \
--to=bauerman@linux.ibm.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=serge@hallyn.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).