diff options
author | Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> | 2015-06-24 17:14:55 +0300 |
---|---|---|
committer | Peter Huewe <peterhuewe@gmx.de> | 2015-07-13 23:34:12 +0200 |
commit | b371616b8537d6450ebca0819defbf53452bebf3 (patch) | |
tree | bd428e4d43248d258ba4a075d19ae39967e2a0b2 /drivers/char/tpm | |
parent | ba0ef85479c46a2ab354c2220bdb6152f7f4baf3 (diff) | |
download | blackbird-op-linux-b371616b8537d6450ebca0819defbf53452bebf3.tar.gz blackbird-op-linux-b371616b8537d6450ebca0819defbf53452bebf3.zip |
tpm, tpm_crb: fail when TPM2 ACPI table contents look corrupted
At least some versions of AMI BIOS have corrupted contents in the TPM2
ACPI table and namely the physical address of the control area is set to
zero.
This patch changes the driver to fail gracefully when we observe a zero
address instead of continuing to ioremap.
Cc: <stable@vger.kernel.org>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Peter Huewe <peterhuewe@gmx.de>
Signed-off-by: Peter Huewe <peterhuewe@gmx.de>
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r-- | drivers/char/tpm/tpm_crb.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 44f9d20c19ac..1267322595da 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c @@ -233,6 +233,14 @@ static int crb_acpi_add(struct acpi_device *device) return -ENODEV; } + /* At least some versions of AMI BIOS have a bug that TPM2 table has + * zero address for the control area and therefore we must fail. + */ + if (!buf->control_area_pa) { + dev_err(dev, "TPM2 ACPI table has a zero address for the control area\n"); + return -EINVAL; + } + if (buf->hdr.length < sizeof(struct acpi_tpm2)) { dev_err(dev, "TPM2 ACPI table has wrong size"); return -EINVAL; |