From cee0cdbc618d89f6e9eb14c360be8230b8397095 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Thu, 22 Dec 2016 20:17:29 +0100 Subject: [PATCH] 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 Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/2138) (cherry picked from commit 38088ce9934a90d4aea486edbff864f3935342e6) --- ssl/ssl_sess.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index eee1ca1f5b..43cb1d371b 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -660,6 +660,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 */ -- 2.25.1