On Tue, Sep 30, 2025 at 02:12:35PM +0200, Stefano Garzarella wrote:
> On Mon, Sep 29, 2025 at 10:48:25PM +0300, Jarkko Sakkinen wrote:
> > From: Jarkko Sakkinen <jarkko.sakkinen@opinsys.com>
> >
> > Use tpm_ret_to_err() to transmute TPM return codes in trusted_tpm2.
> >
> > Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@opinsys.com>
> > ---
> > v3:
> > - No changes.
> > v2:
> > - New patch split out from the fix.
> > ---
> > security/keys/trusted-keys/trusted_tpm2.c | 26 ++++++-----------------
> > 1 file changed, 7 insertions(+), 19 deletions(-)
>
> Nice clean up!
>
> Acked-by: Stefano Garzarella <sgarzare@redhat.com>
Thank you.
>
> >
> > diff --git a/security/keys/trusted-keys/trusted_tpm2.c b/security/keys/trusted-keys/trusted_tpm2.c
> > index 024be262702f..e165b117bbca 100644
> > --- a/security/keys/trusted-keys/trusted_tpm2.c
> > +++ b/security/keys/trusted-keys/trusted_tpm2.c
> > @@ -348,25 +348,19 @@ int tpm2_seal_trusted(struct tpm_chip *chip,
> > }
> >
> > blob_len = tpm2_key_encode(payload, options, &buf.data[offset], blob_len);
> > + if (blob_len < 0)
> > + rc = blob_len;
> >
> > out:
> > tpm_buf_destroy(&sized);
> > tpm_buf_destroy(&buf);
> >
> > - if (rc > 0) {
> > - if (tpm2_rc_value(rc) == TPM2_RC_HASH)
> > - rc = -EINVAL;
> > - else
> > - rc = -EPERM;
> > - }
> > - if (blob_len < 0)
> > - rc = blob_len;
> > - else
> > + if (!rc)
> > payload->blob_len = blob_len;
> >
> > out_put:
> > tpm_put_ops(chip);
> > - return rc;
> > + return tpm_ret_to_err(rc);
> > }
> >
> > /**
> > @@ -468,10 +462,7 @@ static int tpm2_load_cmd(struct tpm_chip *chip,
> > kfree(blob);
> > tpm_buf_destroy(&buf);
> >
> > - if (rc > 0)
> > - rc = -EPERM;
> > -
> > - return rc;
> > + return tpm_ret_to_err(rc);
> > }
> >
> > /**
> > @@ -534,8 +525,6 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip,
> > tpm_buf_fill_hmac_session(chip, &buf);
> > rc = tpm_transmit_cmd(chip, &buf, 6, "unsealing");
> > rc = tpm_buf_check_hmac_response(chip, &buf, rc);
> > - if (rc > 0)
> > - rc = -EPERM;
> >
> > if (!rc) {
> > data_len = be16_to_cpup(
> > @@ -568,7 +557,7 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip,
> >
> > out:
> > tpm_buf_destroy(&buf);
> > - return rc;
> > + return tpm_ret_to_err(rc);
> > }
> >
> > /**
> > @@ -600,6 +589,5 @@ int tpm2_unseal_trusted(struct tpm_chip *chip,
> >
> > out:
> > tpm_put_ops(chip);
> > -
> > - return rc;
> > + return tpm_ret_to_err(rc);
> > }
> > --
> > 2.39.5
> >
> >
>
BR, Jarkko