teec: do fail on MAX_SIZE allocation requests #372
Merged
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
libteec/src/tee_client_api.c
Outdated
| @@ -82,7 +82,8 @@ static void *teec_paged_aligned_alloc(size_t sz) | |||
| size_t page_sz = sysconf(_SC_PAGESIZE); | |||
| size_t aligned_sz = ((sz + page_sz - 1) / page_sz) * page_sz; | |||
|
|
|||
| if (!posix_memalign(&p, page_sz, aligned_sz)) | |||
| /* aligned_sz will be null if MAX_SIZE was requested */ | |||
| if (aligned_sz && !posix_memalign(&p, page_sz, aligned_sz)) | |||
There was a problem hiding this comment.
How about doing a classic overflow check like:
aligned_sz >= sz && ...to make it more obvious.
There was a problem hiding this comment.
ok. I will then remove the comment .
This should work just because TEEC_RegisterSharedMemory checks for size 0 and requests 8 bytes instead btw. Otherwise we would be calling the kernel unnecessarily since the aligned_size would be 0. maybe something to remember.
|
|
|
tags added and versal retested |
The variable aligned_sz will be 0 when the requested sz is MAX_SIZE. Since posix_memalign can return a valid pointer for zero size allocations, share memory registration requests for MAX_SIZE might make it to the kernel. This PR stops it early - just as it was before "teec: use multiple of page size for page aligned buffers" was merged. Fixes: acb0885 ("teec: use multiple of page size for page aligned buffers") Signed-off-by: Jorge Ramirez-Ortiz <jorge@foundries.io> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
|
had to fix the broken reference to the "Fixes" commit. all good now. |
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.
The variable aligned_sz will be 0 when the requested sz is MAX_SIZE. Since posix_memalign can return a valid pointer for zero size allocations, share memory registration requests for MAX_SIZE might make it to the kernel.
This PR stops it early - just as it was before "teec: use multiple of page size for page aligned buffers" was merged.
Fixes: acb0885 ("teec: use multiple of page size for page aligned buffers")