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:   Fri, 10 Jul 2020 15:34:20 -0300
From:   Bruno Meneguele <bmeneg@redhat.com>
To:     Mimi Zohar <zohar@linux.ibm.com>
Cc:     linux-kernel@vger.kernel.org, x86@kernel.org,
        linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org,
        linux-integrity@vger.kernel.org, erichte@linux.ibm.com,
        nayna@linux.ibm.com, stable@vger.kernel.org
Subject: Re: [PATCH v5] ima: move APPRAISE_BOOTPARAM dependency on
 ARCH_POLICY to runtime
Message-ID: <20200710183420.GB10547@glitch>
References: <20200709164647.45153-1-bmeneg@redhat.com>
 <1594401804.14405.8.camel@linux.ibm.com>
 <20200710180338.GA10547@glitch>
MIME-Version: 1.0
In-Reply-To: <20200710180338.GA10547@glitch>
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="dTy3Mrz/UPE2dbVg"
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--dTy3Mrz/UPE2dbVg
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Jul 10, 2020 at 03:03:38PM -0300, Bruno Meneguele wrote:
> On Fri, Jul 10, 2020 at 01:23:24PM -0400, Mimi Zohar wrote:
> > On Thu, 2020-07-09 at 13:46 -0300, Bruno Meneguele wrote:
> > > APPRAISE_BOOTPARAM has been marked as dependent on !ARCH_POLICY in co=
mpile
> > > time, enforcing the appraisal whenever the kernel had the arch policy=
 option
> > > enabled.
> >=20
> > > However it breaks systems where the option is set but the system didn=
't
> > > boot in a "secure boot" platform. In this scenario, anytime an apprai=
sal
> > > policy (i.e. ima_policy=3Dappraisal_tcb) is used it will be forced, w=
ithout
> > > giving the user the opportunity to label the filesystem, before enfor=
cing
> > > integrity.
> > >=20
> > > Considering the ARCH_POLICY is only effective when secure boot is act=
ually
> > > enabled this patch remove the compile time dependency and move it to =
a
> > > runtime decision, based on the secure boot state of that platform.
> >=20
> > Perhaps we could simplify this patch description a bit?
> >=20
> > The IMA_APPRAISE_BOOTPARAM config allows enabling different
> > "ima_appraise=3D" modes - log, fix, enforce - at run time, but not when
> > IMA architecture specific policies are enabled. =A0This prevents
> > properly labeling the filesystem on systems where secure boot is
> > supported, but not enabled on the platform. =A0Only when secure boot is
> > enabled, should these IMA appraise modes be disabled.
> >=20
> > This patch removes the compile time dependency and makes it a runtime
> > decision, based on the secure boot state of that platform.
> >=20
>=20
> Sounds good to me.
>=20
> > <snip>
> >=20
> > > diff --git a/security/integrity/ima/ima_appraise.c b/security/integri=
ty/ima/ima_appraise.c
> > > index a9649b04b9f1..884de471b38a 100644
> > > --- a/security/integrity/ima/ima_appraise.c
> > > +++ b/security/integrity/ima/ima_appraise.c
> > > @@ -19,6 +19,11 @@
> > >  static int __init default_appraise_setup(c
> >=20
> > > har *str)
> > >  {
> > >  #ifdef CONFIG_IMA_APPRAISE_BOOTPARAM
> > > +=09if (arch_ima_get_secureboot()) {
> > > +=09=09pr_info("appraise boot param ignored: secure boot enabled");
> >=20
> > Instead of a generic statement, is it possible to include the actual
> > option being denied? =A0Perhaps something like: "Secure boot enabled,
> > ignoring %s boot command line option"
> >=20
> > Mimi
> >=20
>=20
> Yes, sure.
>=20

Btw, would it make sense to first make sure we have a valid "str"
option and not something random to print?
=20
diff --git a/security/integrity/ima/ima_appraise.c b/security/integrity/ima=
/ima_appraise.c
index a9649b04b9f1..1f1175531d3e 100644
--- a/security/integrity/ima/ima_appraise.c
+++ b/security/integrity/ima/ima_appraise.c
@@ -25,6 +25,16 @@ static int __init default_appraise_setup(char *str)
                ima_appraise =3D IMA_APPRAISE_LOG;
        else if (strncmp(str, "fix", 3) =3D=3D 0)
                ima_appraise =3D IMA_APPRAISE_FIX;
+       else
+               pr_info("invalid \"%s\" appraise option");
+
+       if (arch_ima_get_secureboot()) {
+               if (!is_ima_appraise_enabled()) {
+                       pr_info("Secure boot enabled: ignoring ima_appraise=
=3D%s boot parameter option",
+                               str);
+                       ima_appraise =3D IMA_APPRAISE_ENFORCE;
+               }
+       }
 #endif
        return 1;
 }


The "else" there I think would make sense as well, at least to give the
user some feedback about a possible mispelling of him (as a separate
patch).

And "if(!is_ima_appraise_enabled())" would avoid to print anything about
"ignoring the option" to the user in case he explicitly set "enforce",
which we know there isn't any real effect but is allowed and shown in
kernel-parameters.txt.

> Thanks!
>=20
> > > +=09=09return 1;
> > > +=09}
> > > +
> > >  =09if (strncmp(str, "off", 3) =3D=3D 0)
> > >  =09=09ima_appraise =3D 0;
> > >  =09else if (strncmp(str, "log", 3) =3D=3D 0)
> >=20
>=20
> --=20
> bmeneg=20
> PGP Key: http://bmeneg.com/pubkey.txt


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

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

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

iQEzBAEBCAAdFiEEdWo6nTbnZdbDmXutYdRkFR+RokMFAl8ItKwACgkQYdRkFR+R
okN6GAgAn8hp8spQ9CD62XqNiFqZlX9aYTyBwMwNwU1YsD5D4KGFaBEqkQb39CvQ
9aZMXN3TegwWbfC3yB28dczdWnJqpPwjICUMODQ+qlVKBZIExGEqWwLLmXQs3HNp
DaHPEmZLB5COMygTJKRO/EdfWp3oORR4yKABM/fT0coKE/uqdGBNkDBQBbBbsprS
z4JjcOkpZhGjBpGLM9gYHZz4fOctzVBK0ewGLLxgcY7lpTrlFjgRbDJCuJ+/FmEo
NpT+Nxrs3uo3dlsm3crv2t1o75ELNZQv6bD1qvS4FurrliNiOxFvGL7NEPbXgHIf
OYA8itesTKD5TXA6fNRIKgAHQZC6Ig==
=bOdW
-----END PGP SIGNATURE-----

--dTy3Mrz/UPE2dbVg--