rpms/keepalived
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix unterminated endif in previous patch

Browse Source 
Related: #2134749
This commit is contained in:
Ryan O'Hara 2022-12-23 12:32:09 -06:00
parent 65913b352f
commit fc07f81c04
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bz2134749-fix-memory-leak-https-checks.patch
View File

@ -1,4 +1,4 @@
From a06833b312523a563d0f3c8ddc7d52a24eb691df Mon Sep 17 00:00:00 2001 From b8b463159d9bcb05505ec128b5c2926ace0b3e92 Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk> From: Quentin Armitage <quentin@armitage.org.uk>
Date: Thu, 13 Oct 2022 08:32:17 +0100 Date: Thu, 13 Oct 2022 08:32:17 +0100
Subject: [PATCH] ipvs: Work around OpenSSL memory leak in versions 3.0.0 to Subject: [PATCH] ipvs: Work around OpenSSL memory leak in versions 3.0.0 to
@ -9,11 +9,11 @@ by version 3.0.5. Also the leak is not observed in v1.1.1n.
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk> Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
--- ---
keepalived/check/check_ssl.c | 24 +++++++++++++++++++++--- keepalived/check/check_ssl.c | 20 +++++++++++++++++++-
1 file changed, 21 insertions(+), 3 deletions(-) 1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/keepalived/check/check_ssl.c b/keepalived/check/check_ssl.c diff --git a/keepalived/check/check_ssl.c b/keepalived/check/check_ssl.c
index 917ac0d7..3cae0415 100644 index 917ac0d7..50efa824 100644
--- a/keepalived/check/check_ssl.c --- a/keepalived/check/check_ssl.c
+++ b/keepalived/check/check_ssl.c +++ b/keepalived/check/check_ssl.c
@@ -229,7 +229,25 @@ ssl_connect(thread_ref_t thread, int new_req) @@ -229,7 +229,25 @@ ssl_connect(thread_ref_t thread, int new_req)
@ -43,17 +43,6 @@ index 917ac0d7..3cae0415 100644
BIO_up_ref(req->bio); BIO_up_ref(req->bio);
SSL_set0_rbio(req->ssl, req->bio); SSL_set0_rbio(req->ssl, req->bio);
SSL_set0_wbio(req->ssl, req->bio); SSL_set0_wbio(req->ssl, req->bio);
@@ -246,8 +264,8 @@ ssl_connect(thread_ref_t thread, int new_req)
vhost = checker->vs->virtualhost;
if (vhost)
SSL_set_tlsext_host_name(req->ssl, vhost);
- }
-#endif
+ }#
+endif
}
ret = SSL_connect(req->ssl);
-- --
2.38.1 2.38.1

5
keepalived.spec
View File

@ -11,7 +11,7 @@
Name: keepalived Name: keepalived
Summary: High Availability monitor built upon LVS, VRRP and service pollers Summary: High Availability monitor built upon LVS, VRRP and service pollers
Version: 2.2.4 Version: 2.2.4
Release: 5%{?dist} Release: 6%{?dist}
License: GPLv2+ License: GPLv2+
URL: http://www.keepalived.org/ URL: http://www.keepalived.org/
@ -114,6 +114,9 @@ mkdir -p %{buildroot}%{_libexecdir}/keepalived
%{_mandir}/man8/keepalived.8* %{_mandir}/man8/keepalived.8*
%changelog %changelog
* Fri Dec 23 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.4-6
- Fix unterminated endif in previous patch (#2134749)
* Thu Dec 22 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.4-5 * Thu Dec 22 2022 Ryan O'Hara <rohara@redhat.com> - 2.2.4-5
- Fix memory leak in https checks (#2134749) - Fix memory leak in https checks (#2134749)