diff --git a/ChangeLog b/ChangeLog
index 305eef6..115f56e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,11 @@
 
 = mbed TLS x.x.x branch released xxxx-xx-xx
 
+Security
+   * Fix a potential memory leak in mbedtls_ssl_setup( ) function. An allocation
+     failure could leave an unreleased buffer. A handshake init failure would
+     lead to leaving two unreleased buffers.
+
 Features
    * Add new crypto primitives from RFC 7539: stream cipher Chacha20, one-time
      authenticator Poly1305 and AEAD construct Chacha20-Poly1305. Contributed by
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index f4a34b1..661263a 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -5672,7 +5672,6 @@
                        const mbedtls_ssl_config *conf )
 {
     int err;
-    const size_t len = MBEDTLS_SSL_BUFFER_LEN;
 
     ssl->conf = conf;