core: fix OOM handling in tee_svc_storage_read_head() #2316
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
etienne-lms
reviewed
May 14, 2018
core/tee/tee_svc_storage.c
Outdated
| if (res == TEE_ERROR_OUT_OF_MEMORY) | ||
| goto exit; | ||
| if (bytes != head.attr_size) | ||
| res = TEE_ERROR_CORRUPT_OBJECT; |
There was a problem hiding this comment.
Should be:
if (res == TEE_ERROR_OUT_OF_MEMORY)
goto exit;
if (res != TEE_SUCCESS || bytes != head.attr_size)
res = TEE_ERROR_CORRUPT_OBJECT;
if (res)
goto exit;
core/tee/tee_svc_storage.c
Outdated
| @@ -214,6 +214,8 @@ static TEE_Result tee_svc_storage_read_head(struct tee_obj *o) | |||
| bytes = sizeof(struct tee_svc_storage_head); | |||
| res = fops->read(o->fh, 0, &head, &bytes); | |||
| if (res != TEE_SUCCESS) { | |||
| if (res == TEE_ERROR_OUT_OF_MEMORY) | |||
|
Updated |
|
|
Fixes out of memory handling error in tee_svc_storage_read_head(). Prior to this all errors from fops->read() was reported as TEE_ERROR_CORRUPT_OBJECT leading to removal of the object even when the real problem was temporary memory shortage. This patch reports TEE_ERROR_OUT_OF_MEMORY from fops->read() correctly while translating all other errors to TEE_ERROR_CORRUPT_OBJECT. Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
jenswi-linaro
force-pushed
the
fix_storage
branch
from
7754734
to
d45029a
Compare
|
Tag applied |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes out of memory handling error in tee_svc_storage_read_head(). Prior
to this all errors from fops->read() was reported as
TEE_ERROR_CORRUPT_OBJECT leading to removal of the object even when the
real problem was temporary memory shortage. This patch reports
TEE_ERROR_OUT_OF_MEMORY from fops->read() correctly while translating
all other errors to TEE_ERROR_CORRUPT_OBJECT.
Signed-off-by: Jens Wiklander jens.wiklander@linaro.org
Fixes #2310