raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-15 22:41:38 +00:00
Code Issues Projects Releases Wiki Activity

tpm: Actually fail on TPM errors during "get random"

Browse Source 
commit 782779b60f upstream.

A "get random" may fail with a TPM error, but those codes were returned
as-is to the caller, which assumed the result was the number of bytes
that had been written to the target buffer, which could lead to a kernel
heap memory exposure and over-read.

This fixes tpm1_get_random() to mask positive TPM errors into -EIO, as
before.

[   18.092103] tpm tpm0: A TPM error (379) occurred attempting get random
[   18.092106] usercopy: Kernel memory exposure attempt detected from SLUB object 'kmalloc-64' (offset 0, size 379)!

Link: https://bugzilla.redhat.com/show_bug.cgi?id=1650989
Reported-by: Phil Baker <baker1tex@gmail.com>
Reported-by: Craig Robson <craig@zhatt.com>
Fixes: 7aee9c52d7 ("tpm: tpm1: rewrite tpm1_get_random() using tpm_buf structure")
Cc: Laura Abbott <labbott@redhat.com>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Tomas Winkler <tomas.winkler@intel.com>
Tested-by: Bartosz Szczepanek <bsz@semihalf.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Kees Cook
2019-04-01 12:06:07 -07:00
committed by Greg Kroah-Hartman
parent b487df8a8b
commit 446daaf5d9
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/char/tpm/tpm1-cmd.c
View File

@@ -510,7 +510,7 @@ struct tpm1_get_random_out {
* *
* Return: * Return:
* * number of bytes read * * number of bytes read
* * -errno or a TPM return code otherwise * * -errno (positive TPM return codes are masked to -EIO)
*/ */
int tpm1_get_random(struct tpm_chip *chip, u8 *dest, size_t max) int tpm1_get_random(struct tpm_chip *chip, u8 *dest, size_t max)
{ {
@@ -531,8 +531,11 @@ int tpm1_get_random(struct tpm_chip *chip, u8 *dest, size_t max)
rc = tpm_transmit_cmd(chip, &buf, sizeof(out->rng_data_len), rc = tpm_transmit_cmd(chip, &buf, sizeof(out->rng_data_len),
"attempting get random"); "attempting get random");
if (rc) if (rc) {
if (rc > 0)
rc = -EIO;
goto out; goto out;
}
out = (struct tpm1_get_random_out *)&buf.data[TPM_HEADER_SIZE]; out = (struct tpm1_get_random_out *)&buf.data[TPM_HEADER_SIZE];

7
drivers/char/tpm/tpm2-cmd.c
View File

@@ -301,7 +301,7 @@ struct tpm2_get_random_out {
* *
* Return: * Return:
* size of the buffer on success, * size of the buffer on success,
* -errno otherwise * -errno otherwise (positive TPM return codes are masked to -EIO)
*/ */
int tpm2_get_random(struct tpm_chip *chip, u8 *dest, size_t max) int tpm2_get_random(struct tpm_chip *chip, u8 *dest, size_t max)
{ {
@@ -328,8 +328,11 @@ int tpm2_get_random(struct tpm_chip *chip, u8 *dest, size_t max)
offsetof(struct tpm2_get_random_out, offsetof(struct tpm2_get_random_out,
buffer), buffer),
"attempting get random"); "attempting get random");
if (err) if (err) {
if (err > 0)
err = -EIO;
goto out; goto out;
}
out = (struct tpm2_get_random_out *) out = (struct tpm2_get_random_out *)
&buf.data[TPM_HEADER_SIZE]; &buf.data[TPM_HEADER_SIZE];