[PATCH] integrity: Remove references to module keyring
Mimi Zohar
zohar at linux.ibm.com
Mon Dec 17 20:03:51 UTC 2018
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 at linux.ibm.com>
>
> Mimi, can I add your acked-by?
Acked-by: Mimi Zohar <zohar at 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;
> >
> >
>
More information about the Linux-security-module-archive
mailing list