Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Mon, 8 Jun 2020 10:00:20 -0300
From:   Bruno Meneguele <bmeneg@redhat.com>
To:     Roberto Sassu <roberto.sassu@huawei.com>
Cc:     torvalds@linux-foundation.org, zohar@linux.ibm.com,
        linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org,
        silviu.vlasceanu@huawei.com, stable@vger.kernel.org
Subject: Re: [PATCH] ima: Remove __init annotation from ima_pcrread()
Message-ID: <20200608130020.GA655567@glitch>
References: <20200607210029.30601-1-roberto.sassu@huawei.com>
MIME-Version: 1.0
In-Reply-To: <20200607210029.30601-1-roberto.sassu@huawei.com>
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="h31gzZEtNLTqOjlF"
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--h31gzZEtNLTqOjlF
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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 tha=
t
> the digest can be recalculated for the boot_aggregate measurement entry i=
f
> the 'd' template field has been requested. For the 'd' field, only SHA1 a=
nd
> MD5 digests are accepted.
>=20
> Given that ima_eventdigest_init() does not have the __init annotation, al=
l
> functions called should not have it. This patch removes __init from
> ima_pcrread().
>=20
> Cc: stable@vger.kernel.org
> Fixes:  6cc7c266e5b4 ("ima: Call ima_calc_boot_aggregate() in ima_eventdi=
gest_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(-)
>=20
> 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,
>  =09return calc_buffer_shash(buf, len, hash);
>  }
> =20
> -static void __init ima_pcrread(u32 idx, struct tpm_digest *d)
> +static void ima_pcrread(u32 idx, struct tpm_digest *d)
>  {
>  =09if (!ima_tpm_chip)
>  =09=09return;
> --=20
> 2.17.1
>=20

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

thanks Roberto.

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

--h31gzZEtNLTqOjlF
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEdWo6nTbnZdbDmXutYdRkFR+RokMFAl7eNmQACgkQYdRkFR+R
okN8Xwf/e4bCIbSvzmJh44G85XHrB+tA9X0A070MnWKQ5Bksf6v4kZPmxy4eZ39+
nknWp1a8QMTjS08aNfibFGJbjPROPgXX909VaIOwr18K5GcdTbQLVYF8qhWkDn2E
Z8GW9bDLd7wIct3O1JQIIwaSEUVyReKiclYsITbznjoPnt+RExChTNG2NhkEki+d
yhXXkhaNXpr+EbUHKs/WZFPFX6dK0FsoYD/QA2xnDaPlRvDKjiIE01ojeCOg/hXz
e4tgAWWan1w4Ak8tJeNWBhf7E9Qf+vMEHOCB0uPtnQ8VJRYpxJCkVyQEQ9Ys2LHX
Hh+1816UmnycrQd4Ez8EgOjhpB1ZHQ==
=7AaN
-----END PGP SIGNATURE-----

--h31gzZEtNLTqOjlF--