| Message ID | 20210429192156.770145-2-list.lkml.keyrings@me.benboeckel.net (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | trusted-keys: match tpm_get_ops on all return paths | expand |
On Thu, Apr 29, 2021 at 15:21:56 -0400, Ben Boeckel wrote: > From: Ben Boeckel <mathstuf@gmail.com> > > The `tpm_get_ops` call at the beginning of the function is not paired > with a `tpm_put_ops` on this return path. > > Fixes: f2219745250f ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs") > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > Signed-off-by: Ben Boeckel <mathstuf@gmail.com> > --- > security/keys/trusted-keys/trusted_tpm2.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c > index 617fabd4d913..0165da386289 100644 > --- a/security/keys/trusted-keys/trusted_tpm2.c > +++ b/security/keys/trusted-keys/trusted_tpm2.c > @@ -336,9 +336,9 @@ int tpm2_seal_trusted(struct tpm_chip *chip, > rc = -EPERM; > } > if (blob_len < 0) > - return blob_len; > - > - payload->blob_len = blob_len; > + rc = blob_len; > + else > + payload->blob_len = blob_len; > > tpm_put_ops(chip); > return rc; Ping? Is this going to make 5.13? This fixes an issue that is in 5.13-rc1. --Ben
On Mon, 2021-05-10 at 17:04 -0400, Ben Boeckel wrote: > On Thu, Apr 29, 2021 at 15:21:56 -0400, Ben Boeckel wrote: > > From: Ben Boeckel <mathstuf@gmail.com> > > > > The `tpm_get_ops` call at the beginning of the function is not > > paired > > with a `tpm_put_ops` on this return path. > > > > Fixes: f2219745250f ("security: keys: trusted: use ASN.1 TPM2 key > > format for the blobs") > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > > Signed-off-by: Ben Boeckel <mathstuf@gmail.com> > > --- > > security/keys/trusted-keys/trusted_tpm2.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/security/keys/trusted-keys/trusted_tpm2.c > > b/security/keys/trusted-keys/trusted_tpm2.c > > index 617fabd4d913..0165da386289 100644 > > --- a/security/keys/trusted-keys/trusted_tpm2.c > > +++ b/security/keys/trusted-keys/trusted_tpm2.c > > @@ -336,9 +336,9 @@ int tpm2_seal_trusted(struct tpm_chip *chip, > > rc = -EPERM; > > } > > if (blob_len < 0) > > - return blob_len; > > - > > - payload->blob_len = blob_len; > > + rc = blob_len; > > + else > > + payload->blob_len = blob_len; > > > > tpm_put_ops(chip); > > return rc; > > Ping? Is this going to make 5.13? This fixes an issue that is in > 5.13-rc1. It's not urgent, since it's in an error in the ASN.1 encoder, the only real way to produce it is if the system runs out of memory, which is highly unlikely since the allocations are all GFP_KERNEL. We've also got another 8 or so weeks before 5.13 so there's time for this to go through the normal review process. James
On Mon, May 10, 2021 at 05:04:33PM -0400, Ben Boeckel wrote: > On Thu, Apr 29, 2021 at 15:21:56 -0400, Ben Boeckel wrote: > > From: Ben Boeckel <mathstuf@gmail.com> > > > > The `tpm_get_ops` call at the beginning of the function is not paired > > with a `tpm_put_ops` on this return path. > > > > Fixes: f2219745250f ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs") > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > > Signed-off-by: Ben Boeckel <mathstuf@gmail.com> > > --- > > security/keys/trusted-keys/trusted_tpm2.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c > > index 617fabd4d913..0165da386289 100644 > > --- a/security/keys/trusted-keys/trusted_tpm2.c > > +++ b/security/keys/trusted-keys/trusted_tpm2.c > > @@ -336,9 +336,9 @@ int tpm2_seal_trusted(struct tpm_chip *chip, > > rc = -EPERM; > > } > > if (blob_len < 0) > > - return blob_len; > > - > > - payload->blob_len = blob_len; > > + rc = blob_len; > > + else > > + payload->blob_len = blob_len; > > > > tpm_put_ops(chip); > > return rc; > > Ping? Is this going to make 5.13? This fixes an issue that is in > 5.13-rc1. Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> /Jarkko
On Mon, May 10, 2021 at 05:04:33PM -0400, Ben Boeckel wrote: > On Thu, Apr 29, 2021 at 15:21:56 -0400, Ben Boeckel wrote: > > From: Ben Boeckel <mathstuf@gmail.com> > > > > The `tpm_get_ops` call at the beginning of the function is not paired > > with a `tpm_put_ops` on this return path. > > > > Fixes: f2219745250f ("security: keys: trusted: use ASN.1 TPM2 key format for the blobs") > > Reported-by: Dan Carpenter <dan.carpenter@oracle.com> > > Signed-off-by: Ben Boeckel <mathstuf@gmail.com> > > --- > > security/keys/trusted-keys/trusted_tpm2.c | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c > > index 617fabd4d913..0165da386289 100644 > > --- a/security/keys/trusted-keys/trusted_tpm2.c > > +++ b/security/keys/trusted-keys/trusted_tpm2.c > > @@ -336,9 +336,9 @@ int tpm2_seal_trusted(struct tpm_chip *chip, > > rc = -EPERM; > > } > > if (blob_len < 0) > > - return blob_len; > > - > > - payload->blob_len = blob_len; > > + rc = blob_len; > > + else > > + payload->blob_len = blob_len; > > > > tpm_put_ops(chip); > > return rc; > > Ping? Is this going to make 5.13? This fixes an issue that is in > 5.13-rc1. > > --Ben I applied it, probably will do additional PR for v5.13 in order to fix some urgent tpm_tis issues, so I'll include this to the same pull request. Thanks for fixing this! /Jarkko
On Wed, May 12, 2021 at 02:45:59 +0300, Jarkko Sakkinen wrote: > I applied it, probably will do additional PR for v5.13 in order to fix > some urgent tpm_tis issues, so I'll include this to the same pull > request. Thanks for fixing this! Thanks for the update :) . --Ben
diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c index 617fabd4d913..0165da386289 100644 --- a/security/keys/trusted-keys/trusted_tpm2.c +++ b/security/keys/trusted-keys/trusted_tpm2.c @@ -336,9 +336,9 @@ int tpm2_seal_trusted(struct tpm_chip *chip, rc = -EPERM; } if (blob_len < 0) - return blob_len; - - payload->blob_len = blob_len; + rc = blob_len; + else + payload->blob_len = blob_len; tpm_put_ops(chip); return rc;