commit c5912a41a95c992137228de2466d616080a5f61d
author nagendra modadugu <ngm@google.com> Thu Nov 03 00:38:30 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Nov 03 00:38:30 2016 +0000
tree 439bc2c493a8ad4e98d4ca214ab25fecc2b785d4
parent dd9467de0e0d4bf7415ba0622049a064e581ac6d
parent 07ec984d630c89128306671ec42b964236ce4eaf

tpm: fix assert failure in PCRComputeCurrentDigest
am: 07ec984d63

Change-Id: Icf15d5a8d4fee0f678c5e3b8dddc6e3a18a003a0

Object_spt.c

diff --git a/Object_spt.c b/Object_spt.c
index dd37f1b..4cf13c7 100644
--- a/Object_spt.c
+++ b/Object_spt.c
@@ -533,6 +533,8 @@
    OBJECT                  *parentObject = NULL;
    if(HandleGetType(parentHandle) != TPM_HT_PERMANENT)
        parentObject = ObjectGet(parentHandle);
+    if (publicArea->nameAlg == TPM_ALG_NULL)
+        return TPM_RC_HASH;
     // Check authPolicy digest consistency
     if(   publicArea->authPolicy.t.size != 0
        && (    publicArea->authPolicy.t.size