From: Matt Caswell <matt@openssl.org>
Date: Tue, 28 Apr 2015 14:28:23 +0000 (+0100)
Subject: Add sanity check to ssl_get_prev_session
X-Git-Tag: OpenSSL_1_0_1n~77
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=39b36cb438f7fba7dd3cce1d51d5c6c149f3e48d;hp=26800340dba2bf056d508007ee4d30e41d4e8f5f

Add sanity check to ssl_get_prev_session

Sanity check the |len| parameter to ensure it is positive. Thanks to Kevin
Wojtysiak (Int3 Solutions) and Paramjot Oberoi (Int3 Solutions) for
reporting this issue.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit cb0f400b0cea2d2943f99b1e89c04ff6ed748cd5)
---

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 4c7f5d8b4e..eb7936b4e1 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -478,7 +478,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len,
     int r;
 #endif
 
-    if (len > SSL_MAX_SSL_SESSION_ID_LENGTH)
+    if (len < 0 || len > SSL_MAX_SSL_SESSION_ID_LENGTH)
         goto err;
 
     if (session_id + len > limit) {