[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  38088ce9934a90d4aea486edbff864f3935342e6 (commit)
      from  c2114afc1622ff0113974b3696e557ea8bf7ffb4 (commit)


- Log -----------------------------------------------------------------
commit 38088ce9934a90d4aea486edbff864f3935342e6
Author: Bernd Edlinger <bernd.edlinger at hotmail.de>
Date:   Thu Dec 22 20:17:29 2016 +0100

    Fix a ssl session leak due to OOM in lh_SSL_SESSION_insert
    
    - s == NULL can mean c is a new session *or* lh_insert was
      unable to create a hash entry.
    - use lh_SSL_SESSION_retrieve to check for this error condition.
    - If it happens simply remove the extra reference again.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2138)

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_sess.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index 0ea7438..c6d5c12 100644
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -678,6 +678,15 @@ int SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *c)
          * obtain the same session from an external cache)
          */
         s = NULL;
+    } else if (s == NULL &&
+               lh_SSL_SESSION_retrieve(ctx->sessions, c) == NULL) {
+        /* s == NULL can also mean OOM error in lh_SSL_SESSION_insert ... */
+
+        /*
+         * ... so take back the extra reference and also don't add
+         * the session to the SSL_SESSION_list at this time
+         */
+        s = c;
     }
 
     /* Put at the head of the queue unless it is already in the cache */