Message-ID: <c706add87f230c12d41dc5f74789ed18f43fa9d5.camel@linux.ibm.com>
Subject: Re: [PATCH v6 24/26] powerpc/pseries: Implement secvars for dynamic
 secure boot
From:   Andrew Donnellan <ajd@linux.ibm.com>
To:     Michael Ellerman <michaele@au1.ibm.com>,
        Stefan Berger <stefanb@linux.ibm.com>,
        linuxppc-dev@lists.ozlabs.org, linux-integrity@vger.kernel.org
Cc:     sudhakar@linux.ibm.com, erichte@linux.ibm.com,
        gregkh@linuxfoundation.org, nayna@linux.ibm.com, npiggin@gmail.com,
        linux-kernel@vger.kernel.org, zohar@linux.ibm.com,
        gjoyce@linux.ibm.com, ruscur@russell.cc, joel@jms.id.au,
        bgray@linux.ibm.com, brking@linux.ibm.com, gcwilson@linux.ibm.com
Date:   Mon, 13 Feb 2023 18:07:10 +1100
In-Reply-To: <87y1p2uodm.fsf@mpe.ellerman.id.au>
References: <20230210080401.345462-1-ajd@linux.ibm.com>
         <20230210080401.345462-25-ajd@linux.ibm.com>
         <f35e9ba1-5fdb-4cfa-5b41-cc55307dcd45@linux.ibm.com>
         <a63276d5-1be4-b140-6a4a-4ad4efa60eda@linux.ibm.com>
         <b928627ce5a2d90b0ad33d89ce48ec19a2655111.camel@linux.ibm.com>
         <87y1p2uodm.fsf@mpe.ellerman.id.au>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.3 (3.46.3-1.fc37) 
MIME-Version: 1.0
Precedence: bulk

On Mon, 2023-02-13 at 16:26 +1100, Michael Ellerman wrote:
> Andrew Donnellan <ajd@linux.ibm.com> writes:
> > On Fri, 2023-02-10 at 16:28 -0500, Stefan Berger wrote:
> > > > > +err:
> > > > > +=C2=A0=C2=A0=C2=A0 kfree(var.data);
> > > >=20
> > > > remove the kfree()
> > >=20
> > > Actually don't remove it but it should probably be
> > >=20
> > > if (var.data !=3D &version)
> > > =C2=A0=C2=A0=C2=A0=C2=A0 kfree(var.data);
> > >=20
> >=20
> > Argh, thanks for catching this.
> >=20
> > I don't think the condition is needed - we can assume the var.data
> > is
> > unmodified.
> >=20
> > mpe, are you able to fix this up in merge?
>=20
> Yeah, can you reply here with the delta you want applied.
>=20
> cheers


diff --git a/arch/powerpc/platforms/pseries/plpks-secvar.c
b/arch/powerpc/platforms/pseries/plpks-secvar.c
index 98d0f2b31e0d..bdfe63bc8705 100644
--- a/arch/powerpc/platforms/pseries/plpks-secvar.c
+++ b/arch/powerpc/platforms/pseries/plpks-secvar.c
@@ -135,7 +135,7 @@ static int plpks_set_variable(const char *key, u64
key_len, u8 *data,
 		goto err;
 	var.namelen =3D rc * 2;
=20
-	memcpy(&flags, data, sizeof(flags));
+	flags =3D cpu_to_be64p((__u64 *)data);
=20
 	var.datalen =3D data_size - sizeof(flags);
 	var.data =3D data + sizeof(flags);
@@ -184,7 +184,6 @@ static ssize_t plpks_secvar_format(char *buf,
size_t bufsize)
 	ret =3D snprintf(buf, bufsize, "ibm,plpks-sb-v%hhu", version);
=20
 err:
-	kfree(var.data);
 	return ret;
 }
=20


--=20
Andrew Donnellan    OzLabs, ADL Canberra
ajd@linux.ibm.com   IBM Australia Limited