Fix for data input size of CAAM CMAC do_update() #4583
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
Could this be addressed? |
That's doable. However, I'm not sure to have something to merge before the release tomorrow unfortunately |
That's fine, it can be done later. I suppose adding a few
|
Fix a corner case where the CAAM would try to allocate an input DMA object with a size of 0 bytes. Signed-off-by: Cedric Neveux <cedric.neveux@nxp.com> Signed-off-by: Clement Faure <clement.faure@nxp.com> Acked-by: Jerome Forissier <jerome@forissier.org>
Fix an issue in the CMAC do_update() operation that would happen in the following conditions: * a data temporay buffer full (16 bytes). * an input message of 16 bytes. These conditions would set the data size to be processed by the CAAM equals to zero. This would result on the loss of 16 bytes of the input message and a wrong CMAC. Signed-off-by: Cedric Neveux <cedric.neveux@nxp.com> Signed-off-by: Clement Faure <clement.faure@nxp.com> Acked-by: Jerome Forissier <jerome@forissier.org>
clementfaure
force-pushed
the
fix/caam_cmac_update
branch
from
f20fb8f to
133cbad
Compare
|
@jforissier
Tag applied! |
|
@clementfaure excellent, thanks. |
clementfaure
added a commit
to clementfaure/optee_test
that referenced
this pull request
Apr 29, 2021
Add a CMAC subtest where do_update operations are done with a data input size of 16 bytes. The CAAM CMAC driver does not properly handle multiple do_update operations with 16 bytes input data. Link: OP-TEE/optee_os#4583 Signed-off-by: Clement Faure <clement.faure@nxp.com> Reviewed-by: Jerome Forissier <jerome@forissier.org>
clementfaure
added a commit
to clementfaure/optee_test
that referenced
this pull request
Apr 29, 2021
Add a CMAC subtest where do_update operations are done with a data input size of 16 bytes. The CAAM CMAC driver does not properly handle multiple do_update operations with 16 bytes input data. Link: OP-TEE/optee_os#4583 Signed-off-by: Clement Faure <clement.faure@nxp.com> Reviewed-by: Jerome Forissier <jerome@forissier.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
clementfaure
added a commit
to clementfaure/optee_test
that referenced
this pull request
Apr 29, 2021
Add a CMAC subtest where do_update operations are done with a data input size of 16 bytes. This is a test case for a bug in the CAAM CMAC driver which would not handle properly consecutive do_update operations with input data size of 16 bytes. Link: OP-TEE/optee_os#4583 Signed-off-by: Clement Faure <clement.faure@nxp.com> Reviewed-by: Jerome Forissier <jerome@forissier.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
jforissier
pushed a commit
to OP-TEE/optee_test
that referenced
this pull request
Apr 29, 2021
Add a CMAC subtest where do_update operations are done with a data input size of 16 bytes. This is a test case for a bug in the CAAM CMAC driver which would not handle properly consecutive do_update operations with input data size of 16 bytes. Link: OP-TEE/optee_os#4583 Signed-off-by: Clement Faure <clement.faure@nxp.com> Reviewed-by: Jerome Forissier <jerome@forissier.org> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
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.
Hello,
These are two fixes for the CAAM CMAC we found while inspecting the code.
xtest does not cover these cases.
Thanks!
Clement