From: William Lallemand <wlallemand@haproxy.org>
Date: Mon, 29 Aug 2022 16:36:18 +0000 (+0200)
Subject: BUG/MINOR: ssl: fix deinit of the ca-file tree
X-Git-Tag: v2.7-dev5~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=946580e17af62045707fd93a4bc46465024e5de4;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl: fix deinit of the ca-file tree

Commit b0c4827 ("BUG/MINOR: ssl: free the cafile entries on deinit")
introduced a double free.

The node was never removed from the tree before its free.

Fix issue #1836.

Must be backported where b0c4827 was backported. (2.6 for now).
---

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index d531d39ae9..6db62e193c 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -3908,6 +3908,7 @@ void ckch_deinit()
 
 		entry = ebmb_entry(canode, struct cafile_entry, node);
 		canode = ebmb_next(canode);
+		ebmb_delete(&entry->node);
 		ssl_store_delete_cafile_entry(entry);
 	}
 }