diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-11 12:07:29 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-12-11 12:07:29 +0000 |
commit | baed79a9b2be14f2a1baf788738d3330fb76c842 (patch) | |
tree | 4d638b10f3160aec9d3bbb2f789bafd685f0eed9 | |
parent | 9af888a2518a6177c170bd26393b86763eccb8e0 (diff) | |
parent | 013acaed8f6ff657348bcf52d3b36e017320ada0 (diff) | |
download | tpm2-baed79a9b2be14f2a1baf788738d3330fb76c842.tar.gz |
Snap for 4496165 from 013acaed8f6ff657348bcf52d3b36e017320ada0 to pi-release
Change-Id: Ic8449a12778cff3e603a326ceb36bc508a4cd873
-rw-r--r-- | NV.c | 10 |
1 files changed, 9 insertions, 1 deletions
@@ -1045,7 +1045,15 @@ NvIndexIsAccessible( // 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 |