commit 3f1d0efcbc9ce6322c0af1b02bed2fa9dd20c7ec
author Vadim Bendebury <vbendeb@chromium.org> Sat Dec 09 03:01:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Dec 09 03:01:52 2017 +0000
tree 4d638b10f3160aec9d3bbb2f789bafd685f0eed9
parent 06141a7664b8b92c702032b02311d9042501e0c9
parent 39e898f8b5898b8268b90c4bb5b48c041324335c

NV: allow reading FWMP before startup am: c456225bd5 am: f91bf20527
am: 39e898f8b5

Change-Id: I88c40dad59efef58f8daf51e875bda9d2f3f6833

NV.c

diff --git a/NV.c b/NV.c
index 0099c19..3e639ea 100644
--- a/NV.c
+++ b/NV.c
@@ -1045,7 +1045,15 @@
        // indicated as present
        if(nvIndex.publicArea.attributes.TPMA_NV_PLATFORMCREATE == CLEAR)
        {
-           if(gc.shEnable == FALSE)
+           /*
+            * FWMP is a Chrome OS specific object saved at address 0x100a, it
+            * needs to be available for reading even before TPM2_Startup
+            * command is issued.
+            */
+           UINT32 isFwmpRead = (handle == 0x100100a) &&
+               IsReadOperation(commandCode);
+
+           if((gc.shEnable == FALSE) && !isFwmpRead)
                return TPM_RC_HANDLE;
        }
        // if phEnableNV is CLEAR, a platform created Index should not