14e44be7b0
Resolves: bz#1234220 bz#1286171 bz#1487177 bz#1524457 bz#1640573 Resolves: bz#1663557 bz#1667954 bz#1683602 bz#1686897 bz#1721355 Resolves: bz#1748865 bz#1750211 bz#1754391 bz#1759875 bz#1761531 Resolves: bz#1761932 bz#1763124 bz#1763129 bz#1764091 bz#1775637 Resolves: bz#1776901 bz#1781550 bz#1781649 bz#1781710 bz#1783232 Resolves: bz#1784211 bz#1784415 bz#1786516 bz#1786681 bz#1787294 Resolves: bz#1787310 bz#1787331 bz#1787994 bz#1790336 bz#1792873 Resolves: bz#1794663 bz#1796814 bz#1804164 bz#1810924 bz#1815434 Resolves: bz#1836099 bz#1837467 bz#1837926 bz#1838479 bz#1839137 Resolves: bz#1844359 Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
55 lines
2.0 KiB
Diff
55 lines
2.0 KiB
Diff
From 0e3871a57b7a621444dc5cfd49935a1e412f6436 Mon Sep 17 00:00:00 2001
|
|
From: Mohit Agrawal <moagrawa@redhat.com>
|
|
Date: Mon, 8 Jun 2020 13:27:50 +0530
|
|
Subject: [PATCH 433/449] socket: Resolve ssl_ctx leak for a brick while only
|
|
mgmt SSL is enabled
|
|
|
|
Problem: While only mgmt SSL is enabled for a brick process use_ssl flag
|
|
is false for a brick process and socket api's cleanup ssl_ctx only
|
|
while use_ssl and ssl_ctx both are valid
|
|
|
|
Solution: To avoid a leak check only ssl_ctx, if it is valid cleanup
|
|
ssl_ctx
|
|
|
|
> Fixes: #1196
|
|
> Change-Id: I2f4295478f4149dcb7d608ea78ee5104f28812c3
|
|
> Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
> (Cherry pick from commit 9873baee34afdf0c20f5fc98a7dbf2a9f07447e2)
|
|
> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/24366/)
|
|
|
|
BUG: 1810924
|
|
Change-Id: I2f4295478f4149dcb7d608ea78ee5104f28812c3
|
|
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/202625
|
|
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
---
|
|
rpc/rpc-transport/socket/src/socket.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
|
|
index 226b2e2..54cd5df 100644
|
|
--- a/rpc/rpc-transport/socket/src/socket.c
|
|
+++ b/rpc/rpc-transport/socket/src/socket.c
|
|
@@ -1163,7 +1163,7 @@ __socket_reset(rpc_transport_t *this)
|
|
SSL_free(priv->ssl_ssl);
|
|
priv->ssl_ssl = NULL;
|
|
}
|
|
- if (priv->use_ssl && priv->ssl_ctx) {
|
|
+ if (priv->ssl_ctx) {
|
|
SSL_CTX_free(priv->ssl_ctx);
|
|
priv->ssl_ctx = NULL;
|
|
}
|
|
@@ -4685,7 +4685,7 @@ fini(rpc_transport_t *this)
|
|
SSL_free(priv->ssl_ssl);
|
|
priv->ssl_ssl = NULL;
|
|
}
|
|
- if (priv->use_ssl && priv->ssl_ctx) {
|
|
+ if (priv->ssl_ctx) {
|
|
SSL_CTX_free(priv->ssl_ctx);
|
|
priv->ssl_ctx = NULL;
|
|
}
|
|
--
|
|
1.8.3.1
|
|
|