From: Frédéric Lécaille <flecaille@haproxy.com>
Date: Thu, 25 Oct 2018 18:22:46 +0000 (+0200)
Subject: BUG/MINOR: ssl: Wrong usage of shctx_init().
X-Git-Tag: v1.9-dev5~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c8aa117f9bda3b5253f03ad5a7135a9165060f5;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl: Wrong usage of shctx_init().

With this patch we check that shctx_init() does not return 0.

Must be backported to 1.8.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 140f406b5e..50af63b209 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -4789,7 +4789,7 @@ int ssl_sock_prepare_bind_conf(struct bind_conf *bind_conf)
 		                       sizeof(struct sh_ssl_sess_hdr) + SHSESS_BLOCK_MIN_SIZE, -1,
 		                       sizeof(*sh_ssl_sess_tree),
 		                       ((global.nbthread > 1) || (!global_ssl.private_cache && (global.nbproc > 1))) ? 1 : 0);
-		if (alloc_ctx < 0) {
+		if (alloc_ctx <= 0) {
 			if (alloc_ctx == SHCTX_E_INIT_LOCK)
 				ha_alert("Unable to initialize the lock for the shared SSL session cache. You can retry using the global statement 'tune.ssl.force-private-cache' but it could increase CPU usage due to renegotiations if nbproc > 1.\n");
 			else