Skip to contentSkip to conversation

integrity: Remove references to module keyring

PATCH In review Thiago Jung Bauermann 3 participants 5 messages Dec 13, 2018 – Dec 17, 2018

Subsystems (3)
Security (LSM) Integrity measurement architecture (IMA) Extended Verification Module (EVM)
lore
Share & tools
lore

Thiago Jung Bauermann

author
#0 lore raw

PATCH 1/1 integrity: Remove references to module keyring

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

Signed-off-by Thiago Jung Bauermann <[email protected]>
---
 security/integrity/digsig.c    | 1 -
 security/integrity/integrity.h | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)
security/integrity/digsig.c +0 -1
index c5585e75d5d9..1ff8eab7bc8c 100644
@@ -34,7 +34,6 @@ static const char * const keyring_name[INTEGRITY_KEYRING_MAX] = {
 	".evm",
 	".ima",
 #endif
-	"_module",
 	".platform",
 };
security/integrity/integrity.h +2 -3
index aafa1266e3d5..26c415c3f879 100644
@@ -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;
maintainer
#1 lore raw
Quoted 3 lines · Thiago Jung Bauermann
Quoted 1 line

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

Signed-off-by Thiago Jung Bauermann <[email protected]>

Mimi, can I add your acked-by?

Quoted 34 lines
---
 security/integrity/digsig.c    | 1 -
 security/integrity/integrity.h | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)
security/integrity/digsig.c +0 -1
index c5585e75d5d9..1ff8eab7bc8c 100644
@@ -34,7 +34,6 @@ static const char * const keyring_name[INTEGRITY_KEYRING_MAX] = {
 	".evm",
 	".ima",
 #endif
-	"_module",
 	".platform",
 };
security/integrity/integrity.h +2 -3
index aafa1266e3d5..26c415c3f879 100644
@@ -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;
Signature · 2 lines
James Morris
<[email protected]>
maintainer Acked-by
#2 lore raw
Quoted 3 lines · James Morris
Quoted 1 line · Thiago Jung Bauermann
Quoted 1 line

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

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

Quoted 4 lines
Quoted 2 lines
Signed-off-by Thiago Jung Bauermann <[email protected]>

Mimi, can I add your acked-by?

Acked-by Mimi Zohar <[email protected]>
Quoted 37 lines
Quoted 36 lines

---
 security/integrity/digsig.c    | 1 -
 security/integrity/integrity.h | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)
security/integrity/digsig.c +0 -1
index c5585e75d5d9..1ff8eab7bc8c 100644
@@ -34,7 +34,6 @@ static const char * const keyring_name[INTEGRITY_KEYRING_MAX] = {
 	".evm",
 	".ima",
 #endif
-	"_module",
 	".platform",
 };
security/integrity/integrity.h +2 -3
index aafa1266e3d5..26c415c3f879 100644
@@ -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;
maintainer
#3 lore raw
Quoted 9 lines · Mimi Zohar
Quoted 3 lines · James Morris
Quoted 1 line · Thiago Jung Bauermann
Quoted 1 line

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

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

Quoted 1 line
Quoted 1 line
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Thiago Jung Bauermann <[email protected]>

Mimi, can I add your acked-by?

Acked-by Mimi Zohar <[email protected]>

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-integrity and next-testing

Signature · 2 lines
James Morris
<[email protected]>
author
#4 lore raw
Quoted 13 lines · James Morris
Quoted 11 lines · Mimi Zohar
Quoted 3 lines · James Morris
Quoted 1 line · Thiago Jung Bauermann
Quoted 1 line

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

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

Quoted 3 lines
Quoted 2 lines
Signed-off-by Thiago Jung Bauermann <[email protected]>
Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Mimi, can I add your acked-by?

Acked-by Mimi Zohar <[email protected]>

Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-integrity and next-testing

Thanks!

Signature · 2 lines
Thiago Jung Bauermann
IBM Linux Technology Center