diff options
| author | Vadim Sukhomlinov <sukhomlinov@google.com> | 2022-08-19 10:16:29 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-19 18:18:15 +0000 |
| commit | f096d17cf44eacb27f9ad6d06684465d87da9379 (patch) | |
| tree | 6518f746a23fce758ef9c40502ee1e934a9f99da | |
| parent | e35f5d208df8dfc2f9fc6badb8bb419794f140c2 (diff) | |
| download | chrome-ec-f096d17cf44eacb27f9ad6d06684465d87da9379.tar.gz | |
cr50/nvmem: fix unmarshalling of objectContextID in TPM2 state load
It seems this field is only accessed by TPM2_ContextSave command, didn't
affect the format of data and only led to faster increase of object
context ids. It is unclear if it is related to TPM_RC_OBJECT_MEMORY
errors.
BUG=b:242870497
TEST=TCG test
------------------------------- Test Environment -----------------------
Test Suite Version: 2.1a
Operating System: Linux
TDDL Version: SocketTDDL
---------------------------------- Test Object -------------------------
TPM Vendor: CROS
TPM Firmware Version: 2de0a64 8
TPM Spec Version: 1.16
Vendor Specific Info: xCG , fTPM, ,
Tested Spec Version: 1.16
------------------------------ Test Result Summary ---------------------
Test executed on: Fri Aug 19 10:04:45 2022
Performed Tests: 248
Passed Tests: 248
Failed Tests: 0
Errors: 0
Warnings: 0
========================================================================
Signed-off-by: Vadim Sukhomlinov <sukhomlinov@google.com>
Change-Id: I81c4e8ffbb79c709b046f4db57d86d6007d3574d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3842207
Reviewed-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Tested-by: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Code-Coverage: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Auto-Submit: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Commit-Queue: Vadim Sukhomlinov <sukhomlinov@chromium.org>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
Commit-Queue: Mary Ruthven <mruthven@chromium.org>
| -rw-r--r-- | common/new_nvmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/new_nvmem.c b/common/new_nvmem.c index dea4f92cf5..e55460b042 100644 --- a/common/new_nvmem.c +++ b/common/new_nvmem.c @@ -1762,7 +1762,7 @@ static void unmarshal_state_reset(uint8_t *pad, int size, uint32_t offset) TPM2B_AUTH_Unmarshal(&srd->nullProof, &pad, &size); TPM2B_DIGEST_Unmarshal((TPM2B_DIGEST *)(&srd->nullSeed), &pad, &size); UINT32_Unmarshal(&srd->clearCount, &pad, &size); - UINT64_Marshal(&srd->objectContextID, &pad, &size); + UINT64_Unmarshal(&srd->objectContextID, &pad, &size); memcpy(srd->contextArray, pad, sizeof(srd->contextArray)); size -= sizeof(srd->contextArray); |