143 lines
5.2 KiB
Diff
143 lines
5.2 KiB
Diff
From fbda9baaf7231e3237277348cc7e873f3113fd14 Mon Sep 17 00:00:00 2001
|
|
From: l17zhou <cynthia.zhou@nokia-sbell.com.cn>
|
|
Date: Mon, 4 Nov 2019 08:45:52 +0200
|
|
Subject: [PATCH 388/449] rpc: Cleanup SSL specific data at the time of freeing
|
|
rpc object
|
|
|
|
Problem: At the time of cleanup rpc object ssl specific data
|
|
is not freeing so it has become a leak.
|
|
|
|
Solution: To avoid the leak cleanup ssl specific data at the
|
|
time of cleanup rpc object
|
|
|
|
> Credits: l17zhou <cynthia.zhou@nokia-sbell.com.cn>
|
|
> Fixes: bz#1768407
|
|
> Change-Id: I37f598673ae2d7a33c75f39eb8843ccc6dffaaf0
|
|
> (Cherry pick from commit 54ed71dba174385ab0d8fa415e09262f6250430c)
|
|
> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/23650/)
|
|
|
|
Change-Id: I37f598673ae2d7a33c75f39eb8843ccc6dffaaf0
|
|
BUG: 1786516
|
|
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/202308
|
|
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 | 22 ++++++++++++++++++++--
|
|
tests/features/ssl-authz.t | 23 ++++++++++++++++++++---
|
|
2 files changed, 40 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c
|
|
index 65845ea..226b2e2 100644
|
|
--- a/rpc/rpc-transport/socket/src/socket.c
|
|
+++ b/rpc/rpc-transport/socket/src/socket.c
|
|
@@ -446,6 +446,7 @@ ssl_setup_connection_postfix(rpc_transport_t *this)
|
|
gf_log(this->name, GF_LOG_DEBUG,
|
|
"SSL verification succeeded (client: %s) (server: %s)",
|
|
this->peerinfo.identifier, this->myinfo.identifier);
|
|
+ X509_free(peer);
|
|
return gf_strdup(peer_CN);
|
|
|
|
/* Error paths. */
|
|
@@ -1157,7 +1158,15 @@ __socket_reset(rpc_transport_t *this)
|
|
memset(&priv->incoming, 0, sizeof(priv->incoming));
|
|
|
|
event_unregister_close(this->ctx->event_pool, priv->sock, priv->idx);
|
|
-
|
|
+ if (priv->use_ssl && priv->ssl_ssl) {
|
|
+ SSL_clear(priv->ssl_ssl);
|
|
+ SSL_free(priv->ssl_ssl);
|
|
+ priv->ssl_ssl = NULL;
|
|
+ }
|
|
+ if (priv->use_ssl && priv->ssl_ctx) {
|
|
+ SSL_CTX_free(priv->ssl_ctx);
|
|
+ priv->ssl_ctx = NULL;
|
|
+ }
|
|
priv->sock = -1;
|
|
priv->idx = -1;
|
|
priv->connected = -1;
|
|
@@ -3217,7 +3226,6 @@ socket_server_event_handler(int fd, int idx, int gen, void *data, int poll_in,
|
|
new_priv->sock = new_sock;
|
|
|
|
new_priv->ssl_enabled = priv->ssl_enabled;
|
|
- new_priv->ssl_ctx = priv->ssl_ctx;
|
|
new_priv->connected = 1;
|
|
new_priv->is_server = _gf_true;
|
|
|
|
@@ -4672,6 +4680,16 @@ fini(rpc_transport_t *this)
|
|
pthread_mutex_destroy(&priv->out_lock);
|
|
pthread_mutex_destroy(&priv->cond_lock);
|
|
pthread_cond_destroy(&priv->cond);
|
|
+ if (priv->use_ssl && priv->ssl_ssl) {
|
|
+ SSL_clear(priv->ssl_ssl);
|
|
+ SSL_free(priv->ssl_ssl);
|
|
+ priv->ssl_ssl = NULL;
|
|
+ }
|
|
+ if (priv->use_ssl && priv->ssl_ctx) {
|
|
+ SSL_CTX_free(priv->ssl_ctx);
|
|
+ priv->ssl_ctx = NULL;
|
|
+ }
|
|
+
|
|
if (priv->ssl_private_key) {
|
|
GF_FREE(priv->ssl_private_key);
|
|
}
|
|
diff --git a/tests/features/ssl-authz.t b/tests/features/ssl-authz.t
|
|
index cae010c..132b598 100755
|
|
--- a/tests/features/ssl-authz.t
|
|
+++ b/tests/features/ssl-authz.t
|
|
@@ -25,6 +25,7 @@ TEST glusterd
|
|
TEST pidof glusterd
|
|
TEST $CLI volume info;
|
|
|
|
+TEST $CLI v set all cluster.brick-multiplex on
|
|
# Construct a cipher list that excludes CBC because of POODLE.
|
|
# http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-3566
|
|
#
|
|
@@ -45,12 +46,12 @@ TEST openssl genrsa -out $SSL_KEY 2048
|
|
TEST openssl req -new -x509 -key $SSL_KEY -subj /CN=Anyone -out $SSL_CERT
|
|
ln $SSL_CERT $SSL_CA
|
|
|
|
-TEST $CLI volume create $V0 $H0:$B0/1
|
|
+TEST $CLI volume create $V0 replica 3 $H0:$B0/{1,2,3} force
|
|
TEST $CLI volume set $V0 server.ssl on
|
|
TEST $CLI volume set $V0 client.ssl on
|
|
TEST $CLI volume set $V0 ssl.cipher-list $(valid_ciphers)
|
|
TEST $CLI volume start $V0
|
|
-EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" online_brick_count
|
|
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" online_brick_count
|
|
|
|
# This mount should SUCCEED because ssl-allow=* by default. This effectively
|
|
# disables SSL authorization, though authentication and encryption might still
|
|
@@ -59,11 +60,27 @@ TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
|
|
TEST ping_file $M0/before
|
|
EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
|
|
|
|
+glusterfsd_pid=`pgrep glusterfsd`
|
|
+TEST [ $glusterfsd_pid != 0 ]
|
|
+start=`pmap -x $glusterfsd_pid | grep total | awk -F " " '{print $4}'`
|
|
+echo "Memory consumption for glusterfsd process"
|
|
+for i in $(seq 1 100); do
|
|
+ gluster v heal $V0 info >/dev/null
|
|
+done
|
|
+
|
|
+end=`pmap -x $glusterfsd_pid | grep total | awk -F " " '{print $4}'`
|
|
+diff=$((end-start))
|
|
+
|
|
+# If memory consumption is more than 5M some leak in SSL code path
|
|
+
|
|
+TEST [ $diff -lt 5000 ]
|
|
+
|
|
+
|
|
# Set ssl-allow to a wildcard that includes our identity.
|
|
TEST $CLI volume stop $V0
|
|
TEST $CLI volume set $V0 auth.ssl-allow Any*
|
|
TEST $CLI volume start $V0
|
|
-EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" online_brick_count
|
|
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "3" online_brick_count
|
|
|
|
# This mount should SUCCEED because we match the wildcard.
|
|
TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0
|
|
--
|
|
1.8.3.1
|
|
|