diff options
author | Tim Hudson <tjh@cryptsoft.com> | 2014-05-11 13:29:59 +0100 |
---|---|---|
committer | Matt Caswell <matt@openssl.org> | 2014-05-11 13:38:23 +0100 |
commit | 0b6394c73806c340d49bed69956d37dc14c8a3b7 (patch) | |
tree | ed6d010837e893da2766550118f210ee6498f21b | |
parent | 70ddf8ecca780cee6b636515ecb91262fc7d9e8f (diff) |
safety check to ensure we dont send out beyond the users buffer
-rw-r--r-- | ssl/s3_pkt.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c index ff54ab75fb..312d69094e 100644 --- a/ssl/s3_pkt.c +++ b/ssl/s3_pkt.c @@ -547,6 +547,22 @@ int ssl3_write_bytes(SSL *s, int type, const void *buf_, int len) } } + /* ensure that if we end up with a smaller value of data to write + * out than the the original len from a write which didn't complete + * for non-blocking I/O and also somehow ended up avoiding + * the check for this in ssl3_write_pending/SSL_R_BAD_WRITE_RETRY as + * it must never be possible to end up with (len-tot) as a large + * number that will then promptly send beyond the end of the users + * buffer ... so we trap and report the error in a way the user + * will notice + */ + if ( len < tot) + { + SSLerr(SSL_F_SSL3_WRITE_BYTES,SSL_R_BAD_LENGTH); + return(-1); + } + + n=(len-tot); for (;;) { |