From: Matt Caswell <matt@openssl.org>
Date: Fri, 10 Apr 2015 15:49:33 +0000 (+0100)
Subject: Fix ssl_get_prev_session overrun
X-Git-Tag: OpenSSL_1_1_0-pre1~1320
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=5e0a80c1c9b2b06c2d203ad89778ce1b98e0b5ad;hp=5e9f0eebcfa25a55177d9a7025713262367bec14

Fix ssl_get_prev_session overrun

If OpenSSL is configured with no-tlsext then ssl_get_prev_session can read
past the end of the ClientHello message if the session_id length in the
ClientHello is invalid. This should not cause any security issues since the
underlying buffer is 16k in size. It should never be possible to overrun by
that many bytes.

This is probably made redundant by the previous commit - but you can never be
too careful.

With thanks to Qinghao Tang for reporting this issue.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index a213ea90df..3d0f95090d 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -442,6 +442,11 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
     if (len > SSL_MAX_SSL_SESSION_ID_LENGTH)
         goto err;
 
+    if (session_id + len > limit) {
+        fatal = 1;
+        goto err;
+    }
+
     if (len == 0)
         try_session_cache = 0;