From: William Lallemand <wlallemand@haproxy.com>
Date: Tue, 31 Mar 2020 12:31:41 +0000 (+0200)
Subject: BUG/MINOR: ssl: entry->ckch_inst not initialized
X-Git-Tag: v2.2-dev6~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2e3b72adfa3f7b1d50a3699fe7c99edfb0f0ec5;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl: entry->ckch_inst not initialized

The head of the list entry->ckch_inst was not initialized when opening a
directory or reading a crt-list.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index abbf394723..adc95da7ce 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -4605,6 +4605,7 @@ static int crtlist_load_cert_dir(char *path, struct bind_conf *bind_conf, struct
 			entry->fcount = 0;
 			entry->filters = NULL;
 			entry->ssl_conf = NULL;
+			LIST_INIT(&entry->ckch_inst);
 
 #if HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL
 			is_bundle = 0;
@@ -4862,6 +4863,7 @@ static int crtlist_parse_file(char *file, struct bind_conf *bind_conf, struct pr
 		entry->node.key = ckchs;
 		entry->ssl_conf = ssl_conf;
 		entry->crtlist = newlist;
+		LIST_INIT(&entry->ckch_inst);
 		/* filters */
 		entry->filters = crtlist_dup_filters(&args[cur_arg], arg - cur_arg - 1);
 		entry->fcount = arg - cur_arg - 1;