diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-04-11 12:11:34 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-04-11 12:11:34 -0400 |
| commit | 6302d9373829ff37c257d93f8566f2272968d67d (patch) | |
| tree | b3291d548f272caa091663f4a234df752fd10b3f /ssl | |
| parent | 376dc4e06b4936ff0c9c53b8f53795d0b3774ab3 (diff) | |
Additional check to handle BAD SSL_write retry
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3123)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/record/rec_layer_s3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index 2f105a4c4d..c533bbd73a 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -368,7 +368,8 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) * promptly send beyond the end of the users buffer ... so we trap and * report the error in a way the user will notice */ - if ((unsigned int)len < s->rlayer.wnum) { + if (((unsigned int)len < s->rlayer.wnum) + || ((wb->left != 0) && ((unsigned int)len < (s->rlayer.wnum + s->rlayer.wpend_tot)))) { SSLerr(SSL_F_SSL3_WRITE_BYTES, SSL_R_BAD_LENGTH); return -1; } |