summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2018-08-07 09:57:40 -0700
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2018-08-07 18:08:07 +0000
commitc49ab459bc726197208134ba5585522ce4d9cad3 (patch)
tree73c238124fcf1e4daea2c972fd864a2768b15848
parent27bb066b9ede5af0746a879de2b5ac7455891bcf (diff)
security/tpm: Check for NULL pointer
Change bce49c2 (security/tpm: Improve TCPA log generation) missed checking for NULL pointer before accessing the tcpa_table returned by tcpa_log_init. This change fixes the boot hang observed on octopus by ensuring pointer is checked for NULL before using it. BUG=b:111403731 TEST=Verified that octopus boots up fine. Change-Id: I2e46197065f8db1dc028a85551546263e60d46b2 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: https://review.coreboot.org/27933 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Justin TerAvest <teravest@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/security/tpm/tspi/log.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/security/tpm/tspi/log.c b/src/security/tpm/tspi/log.c
index 0a6655a516..17f6f1f3b9 100644
--- a/src/security/tpm/tspi/log.c
+++ b/src/security/tpm/tspi/log.c
@@ -57,6 +57,10 @@ void tcpa_log_add_table_entry(const char *name, const uint32_t pcr,
struct tcpa_entry *tce;
tclt = tcpa_log_init();
+
+ if (!tclt)
+ return;
+
if (tclt->num_entries == tclt->max_entries) {
printk(BIOS_WARNING, "ERROR: TCPA log table is full\n");
return;