diff options
| author | Jens Wiklander <jens.wiklander@linaro.org> | 2018-05-18 09:59:08 +0200 |
|---|---|---|
| committer | Jérôme Forissier <jerome.forissier@linaro.org> | 2018-05-18 13:42:25 +0200 |
| commit | 655c204eba8db83c4d7b10a7ed5e991be9d26ed3 (patch) | |
| tree | 6db0b87c53c5cbf49854aa46340241b1006d07a9 /core/tee | |
| parent | adb3ccbfc09ac51a6af4855a8d01d7fdf2d3ccbb (diff) | |
core: htree: fix meta inclusion in root hash
Prior to this patch was the size of the meta data supplied as the size
of the pointer to meta data. With this patch the size is corrected to be
the size of meta data itself.
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Fixes: https://github.com/OP-TEE/optee_os/issues/2330
Fixes: 94a72998bc1d ("core: fs_htree: include meta in root hash")
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Diffstat (limited to 'core/tee')
| -rw-r--r-- | core/tee/fs_htree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/tee/fs_htree.c b/core/tee/fs_htree.c index da94d5bf..7ea5fc3c 100644 --- a/core/tee/fs_htree.c +++ b/core/tee/fs_htree.c @@ -415,7 +415,7 @@ static TEE_Result calc_node_hash(struct htree_node *node, return res; if (meta) { - res = crypto_hash_update(ctx, alg, (void *)meta, sizeof(meta)); + res = crypto_hash_update(ctx, alg, (void *)meta, sizeof(*meta)); if (res != TEE_SUCCESS) return res; } |