From 1136fedc334b574eef6f551be158860fda4199f2 Mon Sep 17 00:00:00 2001 From: Pauli Date: Wed, 17 Mar 2021 12:00:42 +1000 Subject: ssl: fix coverity 1451515: out of bounds memory access Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/14585) (cherry picked from commit 3de7f014a985637361bdee775f78209300c88aae) --- ssl/statem/statem_clnt.c | 1 + 1 file changed, 1 insertion(+) (limited to 'ssl') diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c index d84cc0460f..09fba3d8c0 100644 --- a/ssl/statem/statem_clnt.c +++ b/ssl/statem/statem_clnt.c @@ -2905,6 +2905,7 @@ static int tls_construct_cke_psk_preamble(SSL *s, WPACKET *pkt) if (psklen > PSK_MAX_PSK_LEN) { SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, SSL_F_TLS_CONSTRUCT_CKE_PSK_PREAMBLE, ERR_R_INTERNAL_ERROR); + psklen = PSK_MAX_PSK_LEN; /* Avoid overrunning the array on cleanse */ goto err; } else if (psklen == 0) { SSLfatal(s, SSL_AD_HANDSHAKE_FAILURE, -- cgit v1.2.3