lkml.org 
[lkml]   [2021]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v2 1/1] trusted-keys: match tpm_get_ops on all return paths
    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

    \
     
     \ /
      Last update: 2021-05-10 23:04    [W:3.895 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site