diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2021-09-08 07:33:57 +0200 |
---|---|---|
committer | Jarkko Sakkinen <jarkko@kernel.org> | 2021-10-26 04:03:33 +0200 |
commit | a0bcce2b2a169e10eb265c8f0ebdd5ae4c875670 (patch) | |
tree | c569785c1419f682322e7633bbf929054d90f3f4 /drivers/char/tpm/tpm2-space.c | |
parent | tpm: tis: Kconfig: Add helper dependency on COMPILE_TEST (diff) | |
download | linux-a0bcce2b2a169e10eb265c8f0ebdd5ae4c875670.tar.xz linux-a0bcce2b2a169e10eb265c8f0ebdd5ae4c875670.zip |
tpm: Check for integer overflow in tpm2_map_response_body()
The "4 * be32_to_cpu(data->count)" multiplication can potentially
overflow which would lead to memory corruption. Add a check for that.
Cc: stable@vger.kernel.org
Fixes: 745b361e989a ("tpm: infrastructure for TPM spaces")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Diffstat (limited to 'drivers/char/tpm/tpm2-space.c')
-rw-r--r-- | drivers/char/tpm/tpm2-space.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm2-space.c b/drivers/char/tpm/tpm2-space.c index 784b8b3cb903..97e916856cf3 100644 --- a/drivers/char/tpm/tpm2-space.c +++ b/drivers/char/tpm/tpm2-space.c @@ -455,6 +455,9 @@ static int tpm2_map_response_body(struct tpm_chip *chip, u32 cc, u8 *rsp, if (be32_to_cpu(data->capability) != TPM2_CAP_HANDLES) return 0; + if (be32_to_cpu(data->count) > (UINT_MAX - TPM_HEADER_SIZE - 9) / 4) + return -EFAULT; + if (len != TPM_HEADER_SIZE + 9 + 4 * be32_to_cpu(data->count)) return -EFAULT; |