Backport 2.7: Fix unsafe bounds check in ssl_load_session() #2132
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
hanno-becker
added
bug
mbed TLS team
needs-review
AndrzejKurek
previously approved these changes
Oct 25, 2018
hanno-becker
force-pushed
the
iotssl-1046_backport-2.7
branch
from
a0b64df
to
5e0360a
Compare
|
@AndrzejKurek Please re-review. |
library/ssl_ticket.c
Outdated
| return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); | ||
|
|
||
| memcpy( session, p, sizeof( mbedtls_ssl_session ) ); | ||
| p += sizeof( mbedtls_ssl_session ); | ||
|
|
||
| #if defined(MBEDTLS_X509_CRT_PARSE_C) | ||
| if( p + 3 > end ) | ||
| if( 3 > end - p ) |
library/ssl_ticket.c
Outdated
| @@ -219,14 +219,17 @@ static int ssl_load_session( mbedtls_ssl_session *session, | |||
| size_t cert_len; | |||
| #endif /* MBEDTLS_X509_CRT_PARSE_C */ | |||
|
|
|||
| if( p + sizeof( mbedtls_ssl_session ) > end ) | |||
| if( end < p ) | |||
| return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); | |||
There was a problem hiding this comment.
This check is not in the original PR - is this intentional?
AndrzejKurek
previously requested changes
Oct 26, 2018
added 4 commits
October 26, 2018 10:08
Use `( x >> y ) & z` instead of `x >> y & z`. Both are equivalent by operator precedence, but the former is more readable and the commonly used idiom in the library.
Fixes Mbed-TLS#659 reported by Guido Vranken.
hanno-becker
force-pushed
the
iotssl-1046_backport-2.7
branch
from
5e0360a
to
7cf2857
Compare
|
@AndrzejKurek I was waiting for approval for the main PR before adapting the backports - sorry for not mentioning that. Please re-review. |
hanno-becker
dismissed
AndrzejKurek’s stale review
Backport reworked in line with the changes in the main PR.
mpg
approved these changes
Oct 29, 2018
AndrzejKurek
approved these changes
Oct 30, 2018
AndrzejKurek
approved these changes
Oct 30, 2018
hanno-becker
removed
the
needs-review
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.
Summary: This is the backport to Mbed TLS 2.7 of #2131 fixing #659.
Internal Reference: IOTSSL-1046.