diff options
| author | nagendra modadugu <ngm@google.com> | 2016-07-15 23:09:15 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2016-07-17 04:51:29 +0000 |
| commit | dd4c0d87f2db2e935190de5d8bef6063cff68eab (patch) | |
| tree | 0d4a45b921c4411b89aa7b86ded71eb012451f13 | |
| parent | 12f0a12d99f23d5ac1879287017dedb498652641 (diff) | |
| download | chrome-ec-dd4c0d87f2db2e935190de5d8bef6063cff68eab.tar.gz | |
CR50: zeroize manufacture related structs prior to use
Zeroize structs are only partially populated by the caller.
BRANCH=none
BUG=chrome-os-partner:43025,chrome-os-partner:47524
BUG=chrome-os-partner:50115,chrome-os-partner:55260
TEST=build succeeds
Change-Id: I82a0758bedcf7f0565c8a541dfdc49c6bc0e9d0c
Signed-off-by: nagendra modadugu <ngm@google.com>
Reviewed-on: https://chromium-review.googlesource.com/360953
Tested-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-by: Vadim Bendebury <vbendeb@chromium.org>
Commit-Queue: Vadim Bendebury <vbendeb@chromium.org>
| -rw-r--r-- | board/cr50/tpm2/manufacture.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/board/cr50/tpm2/manufacture.c b/board/cr50/tpm2/manufacture.c index c31766ebd5..c8b3663c91 100644 --- a/board/cr50/tpm2/manufacture.c +++ b/board/cr50/tpm2/manufacture.c @@ -385,6 +385,11 @@ static int store_cert(enum cros_perso_component_type component_type, TPMA_NV space_attributes; NV_Write_In in; + /* Clear up structures potentially uszed only partially. */ + memset(&define_space, 0, sizeof(define_space)); + memset(&space_attributes, 0, sizeof(space_attributes)); + memset(&in, 0, sizeof(in)); + /* Indicate that a system reset has occurred, and currently * running with Platform auth. */ @@ -395,8 +400,6 @@ static int store_cert(enum cros_perso_component_type component_type, else /* P256 certificate. */ nv_index = ecc_ek_nv_index; - memset(&space_attributes, 0, sizeof(space_attributes)); - /* Writeable under platform auth. */ space_attributes.TPMA_NV_PPWRITE = 1; /* Not modifyable by OWNER; require PLATFORM auth. */ |