The chip is not released when the validation for @digests fails. Add
tpm_put_ops() to the failure path.

Cc: sta...@vger.kernel.org
Reported-by: Roberto Sassu <roberto.sa...@huawei.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakki...@linux.intel.com>
---
 drivers/char/tpm/tpm-interface.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c
index 208e5ba40e6e..c7eeb40feac8 100644
--- a/drivers/char/tpm/tpm-interface.c
+++ b/drivers/char/tpm/tpm-interface.c
@@ -320,18 +320,22 @@ int tpm_pcr_extend(struct tpm_chip *chip, u32 pcr_idx,
        if (!chip)
                return -ENODEV;
 
-       for (i = 0; i < chip->nr_allocated_banks; i++)
-               if (digests[i].alg_id != chip->allocated_banks[i].alg_id)
-                       return -EINVAL;
+       for (i = 0; i < chip->nr_allocated_banks; i++) {
+               if (digests[i].alg_id != chip->allocated_banks[i].alg_id) {
+                       rc = EINVAL;
+                       goto out;
+               }
+       }
 
        if (chip->flags & TPM_CHIP_FLAG_TPM2) {
                rc = tpm2_pcr_extend(chip, pcr_idx, digests);
-               tpm_put_ops(chip);
-               return rc;
+               goto out;
        }
 
        rc = tpm1_pcr_extend(chip, pcr_idx, digests[0].digest,
                             "attempting extend a PCR value");
+
+out:
        tpm_put_ops(chip);
        return rc;
 }
-- 
2.20.1

Reply via email to