From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 21 Sep 2016 11:57:01 +0000 (+0100)
Subject: Remove unnecessary check.
X-Git-Tag: OpenSSL_1_0_1u~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aa388af1e18988894a48b8f64ae994eaa4366d5d;p=thirdparty%2Fopenssl.git

Remove unnecessary check.

The overflow check will never be triggered because the
the n2l3 result is always less than 2^24.

Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 709ec8b3848e2ac201b86f49c5561debb8572ccd)
---

diff --git a/ssl/s3_both.c b/ssl/s3_both.c
index c51fc6ea01..498e3975f5 100644
--- a/ssl/s3_both.c
+++ b/ssl/s3_both.c
@@ -497,11 +497,6 @@ long ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok)
             SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_EXCESSIVE_MESSAGE_SIZE);
             goto f_err;
         }
-        if (l > (INT_MAX - 4)) { /* BUF_MEM_grow takes an 'int' parameter */
-            al = SSL_AD_ILLEGAL_PARAMETER;
-            SSLerr(SSL_F_SSL3_GET_MESSAGE, SSL_R_EXCESSIVE_MESSAGE_SIZE);
-            goto f_err;
-        }
         if (l && !BUF_MEM_grow_clean(s->init_buf, (int)l + 4)) {
             SSLerr(SSL_F_SSL3_GET_MESSAGE, ERR_R_BUF_LIB);
             goto err;