Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 18 Dec 2018 06:33:45 +1100 (AEDT)
From:   James Morris <jmorris@namei.org>
To:     Thiago Jung Bauermann <bauerman@linux.ibm.com>
cc:     linux-security-module@vger.kernel.org,
        "Serge E. Hallyn" <serge@hallyn.com>,
        Mimi Zohar <zohar@linux.ibm.com>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] integrity: Remove references to module keyring
In-Reply-To: <20181213013909.25737-1-bauerman@linux.ibm.com>
Message-ID: <alpine.LRH.2.21.1812180633290.29218@namei.org>
References: <20181213013909.25737-1-bauerman@linux.ibm.com>
User-Agent: Alpine 2.21 (LRH 202 2017-01-01)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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>