tpm: Cap the number of PCR banks

commit faf07e611dfa464b201223a7253e9dc5ee0f3c9e upstream.

tpm2_get_pcr_allocation() does not cap any upper limit for the number of
banks. Cap the limit to eight banks so that out of bounds values coming
from external I/O cause on only limited harm.

Cc: stable@vger.kernel.org # v5.10+
Fixes: bcfff8384f6c ("tpm: dynamically allocate the allocated_banks array")
Tested-by: Lai Yi <yi1.lai@linux.intel.com>
Reviewed-by: Jonathan McDowell <noodles@meta.com>
Reviewed-by: Roberto Sassu <roberto.sassu@huawei.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@opinsys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c
index e25daf2396d37bcaeae8a96267764df0861ad1be..dfeb28866a327329a316ca26fae4ba84993e485e 100644 (file)
--- a/drivers/char/tpm/tpm-chip.c
+++ b/drivers/char/tpm/tpm-chip.c
@@ -282,7 +282,6 @@ static void tpm_dev_release(struct device *dev)
 
        kfree(chip->work_space.context_buf);
        kfree(chip->work_space.session_buf);
-       kfree(chip->allocated_banks);
 #ifdef CONFIG_TCG_TPM2_HMAC
        kfree(chip->auth);
 #endif

diff --git a/drivers/char/tpm/tpm1-cmd.c b/drivers/char/tpm/tpm1-cmd.c
index cf64c738510529bc8b8a751bdaac20cfe6b884bc..b49a790f1bd53fac29a3d70a87d4f1d3ad9cf869 100644 (file)
--- a/drivers/char/tpm/tpm1-cmd.c
+++ b/drivers/char/tpm/tpm1-cmd.c
@@ -799,11 +799,6 @@ int tpm1_pm_suspend(struct tpm_chip *chip, u32 tpm_suspend_pcr)
  */
 int tpm1_get_pcr_allocation(struct tpm_chip *chip)
 {
-       chip->allocated_banks = kcalloc(1, sizeof(*chip->allocated_banks),
-                                       GFP_KERNEL);
-       if (!chip->allocated_banks)
-               return -ENOMEM;
-
        chip->allocated_banks[0].alg_id = TPM_ALG_SHA1;
        chip->allocated_banks[0].digest_size = hash_digest_size[HASH_ALGO_SHA1];
        chip->allocated_banks[0].crypto_id = HASH_ALGO_SHA1;

diff --git a/drivers/char/tpm/tpm2-cmd.c b/drivers/char/tpm/tpm2-cmd.c
index dfdcbd009720607cc1fb8acd3ee6ba5edf695cae..2bc716fbf2157b15051a08b193ab813be6dbb57b 100644 (file)
--- a/drivers/char/tpm/tpm2-cmd.c
+++ b/drivers/char/tpm/tpm2-cmd.c
@@ -602,11 +602,9 @@ ssize_t tpm2_get_pcr_allocation(struct tpm_chip *chip)
 
        nr_possible_banks = be32_to_cpup(
                (__be32 *)&buf.data[TPM_HEADER_SIZE + 5]);
-
-       chip->allocated_banks = kcalloc(nr_possible_banks,
-                                       sizeof(*chip->allocated_banks),
-                                       GFP_KERNEL);
-       if (!chip->allocated_banks) {
+       if (nr_possible_banks > TPM2_MAX_PCR_BANKS) {
+               pr_err("tpm: out of bank capacity: %u > %u\n",
+                      nr_possible_banks, TPM2_MAX_PCR_BANKS);
                rc = -ENOMEM;
                goto out;
        }

diff --git a/include/linux/tpm.h b/include/linux/tpm.h
index a3d8305e88a51ec41c3fe1286c3b54f360d281db..117e0f620d5209c7f2e31909730cb1c5600e441b 100644 (file)
--- a/include/linux/tpm.h
+++ b/include/linux/tpm.h
@@ -26,7 +26,9 @@
 #include <crypto/aes.h>
 
 #define TPM_DIGEST_SIZE 20     /* Max TPM v1.2 PCR size */
-#define TPM_MAX_DIGEST_SIZE SHA512_DIGEST_SIZE
+
+#define TPM2_MAX_DIGEST_SIZE   SHA512_DIGEST_SIZE
+#define TPM2_MAX_PCR_BANKS     8
 
 struct tpm_chip;
 struct trusted_key_payload;
@@ -68,7 +70,7 @@ enum tpm2_curves {
 
 struct tpm_digest {
        u16 alg_id;
-       u8 digest[TPM_MAX_DIGEST_SIZE];
+       u8 digest[TPM2_MAX_DIGEST_SIZE];
 } __packed;
 
 struct tpm_bank_info {
@@ -188,7 +190,7 @@ struct tpm_chip {
        unsigned int groups_cnt;
 
        u32 nr_allocated_banks;
-       struct tpm_bank_info *allocated_banks;
+       struct tpm_bank_info allocated_banks[TPM2_MAX_PCR_BANKS];
 #ifdef CONFIG_ACPI
        acpi_handle acpi_dev_handle;
        char ppi_version[TPM_PPI_VERSION_LEN + 1];