diff options
| author | William Lallemand <wlallemand@haproxy.com> | 2020-08-26 17:34:44 +0200 |
|---|---|---|
| committer | William Lallemand <wlallemand@haproxy.org> | 2020-08-26 17:39:23 +0200 |
| commit | a78f3f0d79dc68bb42c2944439202f7cff40cc7f (patch) | |
| tree | 0f2e4223002d0b9a069fbb2d627127a89ea729c6 | |
| parent | cf1f193624acb9d5a52f40375bb445e5438dd89e (diff) | |
| download | haproxy-a78f3f0d79dc68bb42c2944439202f7cff40cc7f.tar.gz | |
BUG/MEDIUM: ssl: fix ssl_bind_conf double free w/ wildcards
The fix 7df5c2d ("BUG/MEDIUM: ssl: fix ssl_bind_conf double free") was
not complete. The problem still occurs when using wildcards in
certificate, during the deinit.
This patch removes the free of the ssl_conf structure in
ssl_sock_free_all_ctx() since it's already done in the crtlist deinit.
It must be backported in 2.2.
| -rw-r--r-- | src/ssl_sock.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/ssl_sock.c b/src/ssl_sock.c index 6e6f337ff..64208daef 100644 --- a/src/ssl_sock.c +++ b/src/ssl_sock.c @@ -5040,11 +5040,6 @@ void ssl_sock_free_all_ctx(struct bind_conf *bind_conf) back = ebmb_next(node); ebmb_delete(node); SSL_CTX_free(sni->ctx); - if (!sni->order) { /* only free the SSL conf its first occurrence */ - ssl_sock_free_ssl_conf(sni->conf); - free(sni->conf); - sni->conf = NULL; - } LIST_DEL(&sni->by_ckch_inst); free(sni); node = back; |