* [PATCH] integrity: Remove references to module keyring
@ 2018-12-13 1:39 Thiago Jung Bauermann
2018-12-17 19:33 ` James Morris
0 siblings, 1 reply; 5+ messages in thread
From: Thiago Jung Bauermann @ 2018-12-13 1:39 UTC (permalink / raw)
To: linux-security-module
Cc: James Morris, Serge E. Hallyn, Mimi Zohar, linux-kernel,
Thiago Jung Bauermann
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;
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] integrity: Remove references to module keyring
2018-12-13 1:39 [PATCH] integrity: Remove references to module keyring Thiago Jung Bauermann
@ 2018-12-17 19:33 ` James Morris
2018-12-17 20:03 ` Mimi Zohar
0 siblings, 1 reply; 5+ messages in thread
From: James Morris @ 2018-12-17 19:33 UTC (permalink / raw)
To: Thiago Jung Bauermann
Cc: linux-security-module, Serge E. Hallyn, Mimi Zohar, linux-kernel
On Wed, 12 Dec 2018, Thiago Jung Bauermann wrote:
> >From what I can tell, it has never been used.
>
> Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
Mimi, can I add your acked-by?
> ---
> 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;
>
>
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] integrity: Remove references to module keyring
2018-12-17 19:33 ` James Morris
@ 2018-12-17 20:03 ` Mimi Zohar
2018-12-17 22:11 ` James Morris
0 siblings, 1 reply; 5+ messages in thread
From: Mimi Zohar @ 2018-12-17 20:03 UTC (permalink / raw)
To: James Morris, Thiago Jung Bauermann
Cc: linux-security-module, Serge E. Hallyn, linux-kernel
On Tue, 2018-12-18 at 06:33 +1100, James Morris wrote:
> On Wed, 12 Dec 2018, Thiago Jung Bauermann wrote:
>
> > >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.
> >
> > Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
>
> Mimi, can I add your acked-by?
Acked-by: Mimi Zohar <zohar@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;
> >
> >
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] integrity: Remove references to module keyring
2018-12-17 20:03 ` Mimi Zohar
@ 2018-12-17 22:11 ` James Morris
2018-12-17 22:37 ` Thiago Jung Bauermann
0 siblings, 1 reply; 5+ messages in thread
From: James Morris @ 2018-12-17 22:11 UTC (permalink / raw)
To: Mimi Zohar
Cc: Thiago Jung Bauermann, linux-security-module, Serge E. Hallyn,
linux-kernel
On Mon, 17 Dec 2018, Mimi Zohar wrote:
> On Tue, 2018-12-18 at 06:33 +1100, James Morris wrote:
> > On Wed, 12 Dec 2018, Thiago Jung Bauermann wrote:
> >
> > > >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.
>
> > >
> > > Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
> >
> > Mimi, can I add your acked-by?
>
> Acked-by: Mimi Zohar <zohar@linux.ibm.com>
Applied to
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-integrity
and next-testing
--
James Morris
<jmorris@namei.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] integrity: Remove references to module keyring
2018-12-17 22:11 ` James Morris
@ 2018-12-17 22:37 ` Thiago Jung Bauermann
0 siblings, 0 replies; 5+ messages in thread
From: Thiago Jung Bauermann @ 2018-12-17 22:37 UTC (permalink / raw)
To: James Morris
Cc: Mimi Zohar, linux-security-module, Serge E. Hallyn, linux-kernel
James Morris <jmorris@namei.org> writes:
> On Mon, 17 Dec 2018, Mimi Zohar wrote:
>
>> On Tue, 2018-12-18 at 06:33 +1100, James Morris wrote:
>> > On Wed, 12 Dec 2018, Thiago Jung Bauermann wrote:
>> >
>> > > >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.
>>
>> > >
>> > > Signed-off-by: Thiago Jung Bauermann <bauerman@linux.ibm.com>
>> >
>> > Mimi, can I add your acked-by?
>>
>> Acked-by: Mimi Zohar <zohar@linux.ibm.com>
>
> Applied to
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git next-integrity
> and next-testing
Thanks!
--
Thiago Jung Bauermann
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-12-17 22:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-13 1:39 [PATCH] integrity: Remove references to module keyring Thiago Jung Bauermann
2018-12-17 19:33 ` James Morris
2018-12-17 20:03 ` Mimi Zohar
2018-12-17 22:11 ` James Morris
2018-12-17 22:37 ` Thiago Jung Bauermann
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).