Re: [PATCH] ima: Remove __init annotation from ima_pcrread()

[Bruno Meneguele <bmeneg@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 1591 bytes --]

On Sun, Jun 07, 2020 at 11:00:29PM +0200, Roberto Sassu wrote:
> Commit 6cc7c266e5b4 ("ima: Call ima_calc_boot_aggregate() in
> ima_eventdigest_init()") added a call to ima_calc_boot_aggregate() so that
> the digest can be recalculated for the boot_aggregate measurement entry if
> the 'd' template field has been requested. For the 'd' field, only SHA1 and
> MD5 digests are accepted.
> 
> Given that ima_eventdigest_init() does not have the __init annotation, all
> functions called should not have it. This patch removes __init from
> ima_pcrread().
> 
> Cc: stable@vger.kernel.org
> Fixes:  6cc7c266e5b4 ("ima: Call ima_calc_boot_aggregate() in ima_eventdigest_init()")
> Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: Roberto Sassu <roberto.sassu@huawei.com>
> ---
>  security/integrity/ima/ima_crypto.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/security/integrity/ima/ima_crypto.c b/security/integrity/ima/ima_crypto.c
> index ba5cc3264240..220b14920c37 100644
> --- a/security/integrity/ima/ima_crypto.c
> +++ b/security/integrity/ima/ima_crypto.c
> @@ -786,7 +786,7 @@ int ima_calc_buffer_hash(const void *buf, loff_t len,
>  	return calc_buffer_shash(buf, len, hash);
>  }
>  
> -static void __init ima_pcrread(u32 idx, struct tpm_digest *d)
> +static void ima_pcrread(u32 idx, struct tpm_digest *d)
>  {
>  	if (!ima_tpm_chip)
>  		return;
> -- 
> 2.17.1
> 

Reviewed-by: Bruno Meneguele <bmeneg@redhat.com>

thanks Roberto.

-- 
bmeneg 
PGP Key: http://bmeneg.com/pubkey.txt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]