diff options
author | Vadim Bendebury <vbendeb@chromium.org> | 2017-12-09 02:57:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-12-09 02:57:55 +0000 |
commit | 39e898f8b5898b8268b90c4bb5b48c041324335c (patch) | |
tree | 4d638b10f3160aec9d3bbb2f789bafd685f0eed9 | |
parent | 1e1db6bea186eb965b8f45d4ef6d4c7564fb56ce (diff) | |
parent | f91bf20527dae2d21fa017703093b889e7765463 (diff) | |
download | tpm2-39e898f8b5898b8268b90c4bb5b48c041324335c.tar.gz |
NV: allow reading FWMP before startup am: c456225bd5
am: f91bf20527
Change-Id: Ia16f65b55f05626b72e0aa985a0ea873cbc1ea4a
-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 |