tpm: fix potential buffer overruns caused by bit glitches on the bus
Subsystems (2)
James Bottomley
maintainerPATCH v2 1/5 tpm: fix potential buffer overruns caused by bit glitches on the bus
From: Jeremy Boone <[email protected]>
Discrete TPMs are often connected over slow serial buses which, on some platforms, can have glitches causing bit flips. If a bit does flip it could cause an overrun if it's in one of the size parameters, so sanity check that we're not overrunning the provided buffer when doing a memcpy().
---
v2: add -EFAULT for received being too big
drivers/char/tpm/tpm-interface.c | 4 ++++ drivers/char/tpm/tpm2-cmd.c | 4 ++++ 2 files changed, 8 insertions(+)
drivers/char/tpm/tpm-interface.c +4 -0
@@ -1228,6 +1228,10 @@ int tpm_get_random(u32 chip_num, u8 *out, size_t max)break ; recd =be32_to_cpu (tpm_cmd.params.getrandom_out.rng_data_len); +if (recd > num_bytes) { + total = -EFAULT ; +break ; + } rlength =be32_to_cpu (tpm_cmd.header.out.length); if (rlength < offsetof(struct tpm_getrandom_out, rng_data) +
drivers/char/tpm/tpm2-cmd.c +4 -0
@@ -683,6 +683,10 @@ static int tpm2_unseal_cmd(struct tpm_chip *chip,if (!rc) { data_len =be16_to_cpup ( (__be16 *) &buf.data[TPM_HEADER_SIZE +4 ]); +if (data_len <MIN_KEY_SIZE || data_len >MAX_KEY_SIZE +1 ) { + rc = -EFAULT ; + goto out; + } rlength =be32_to_cpu (((struct tpm2_cmd *)&buf) ->header.out.length);
Signature · 1 line
2.12.3
Quoted 11 lines · James Bottomley
From: Jeremy Boone <[email protected]>
Discrete TPMs are often connected over slow serial buses which, on some platforms, can have glitches causing bit flips. If a bit does flip it could cause an overrun if it's in one of the size parameters, so sanity check that we're not overrunning the provided buffer when doing a
memcpy().Signed-off-by Jeremy Boone <[email protected]>Signed-off-by James Bottomley <[email protected]>
/Jarkko