tpm: Actually fail on TPM errors during "get random"
authorKees Cook <keescook@chromium.org>
Mon, 1 Apr 2019 19:06:07 +0000 (12:06 -0700)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Mon, 24 Jun 2019 20:57:49 +0000 (23:57 +0300)
commit782779b60faa2fc7ff609ac8ef938260fd792c0f
tree56c4d8f22366f244910bd96c4ed6e1b6b553cc7d
parentc88e40e07cd967dcdf37321a63ab6e8b0d881100
tpm: Actually fail on TPM errors during "get random"

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: 7aee9c52d7ac ("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>
drivers/char/tpm/tpm1-cmd.c
drivers/char/tpm/tpm2-cmd.c