|
 |
e7a346 |
From 76823d120518528c4edad4af6f4c1cdd50f5b398 Mon Sep 17 00:00:00 2001
|
|
|
e7a346 |
From: Mohit Agrawal <moagrawal@redhat.com>
|
|
|
e7a346 |
Date: Tue, 24 Jul 2018 14:48:35 +0530
|
|
|
e7a346 |
Subject: [PATCH 332/333] rpc: rpc_clnt_connection_cleanup is crashed due to
|
|
|
e7a346 |
double free
|
|
|
e7a346 |
|
|
|
e7a346 |
Problem: gfapi client is getting crashed in rpc_clnt_connection_cleanup
|
|
|
e7a346 |
at the time of destroying saved_frames
|
|
|
e7a346 |
|
|
|
e7a346 |
Solution: gfapi client is getting crashed because saved_frame ptr is
|
|
|
e7a346 |
already freed in rpc_clnt_destroy.To avoid the same update
|
|
|
e7a346 |
code in rpc_clnt_destroy
|
|
|
e7a346 |
|
|
|
e7a346 |
> Change-Id: Id8cce102b49f26cfd86ef88257032ed98f43192b
|
|
|
e7a346 |
> fixes: bz#1607783
|
|
|
e7a346 |
> (cherry picked from commit abd7b1393294d29eef6913e7f93ab76040c90428)
|
|
|
e7a346 |
> (Reviewed on upstream link https://review.gluster.org/#/c/20557/)
|
|
|
e7a346 |
|
|
|
e7a346 |
Change-Id: Id3200e36acc1c49a8f5d39a1cc5053864899754c
|
|
|
e7a346 |
BUG: 1600790
|
|
|
e7a346 |
Signed-off-by: Mohit Agrawal <moagrawal@redhat.com>
|
|
|
e7a346 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/145377
|
|
|
e7a346 |
Tested-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
|
e7a346 |
Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
e7a346 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
e7a346 |
---
|
|
|
e7a346 |
rpc/rpc-lib/src/rpc-clnt.c | 20 +++++++++++++++++---
|
|
|
e7a346 |
1 file changed, 17 insertions(+), 3 deletions(-)
|
|
|
e7a346 |
|
|
|
e7a346 |
diff --git a/rpc/rpc-lib/src/rpc-clnt.c b/rpc/rpc-lib/src/rpc-clnt.c
|
|
|
e7a346 |
index 1ea8099..fd7e3ec 100644
|
|
|
e7a346 |
--- a/rpc/rpc-lib/src/rpc-clnt.c
|
|
|
e7a346 |
+++ b/rpc/rpc-lib/src/rpc-clnt.c
|
|
|
e7a346 |
@@ -1771,13 +1771,27 @@ rpc_clnt_trigger_destroy (struct rpc_clnt *rpc)
|
|
|
e7a346 |
static void
|
|
|
e7a346 |
rpc_clnt_destroy (struct rpc_clnt *rpc)
|
|
|
e7a346 |
{
|
|
|
e7a346 |
- rpcclnt_cb_program_t *program = NULL;
|
|
|
e7a346 |
- rpcclnt_cb_program_t *tmp = NULL;
|
|
|
e7a346 |
+ rpcclnt_cb_program_t *program = NULL;
|
|
|
e7a346 |
+ rpcclnt_cb_program_t *tmp = NULL;
|
|
|
e7a346 |
+ struct saved_frames *saved_frames = NULL;
|
|
|
e7a346 |
+ rpc_clnt_connection_t *conn = NULL;
|
|
|
e7a346 |
|
|
|
e7a346 |
if (!rpc)
|
|
|
e7a346 |
return;
|
|
|
e7a346 |
|
|
|
e7a346 |
- saved_frames_destroy (rpc->conn.saved_frames);
|
|
|
e7a346 |
+ conn = &rpc->conn;
|
|
|
e7a346 |
+ /* Access saved_frames in critical-section to avoid
|
|
|
e7a346 |
+ crash in rpc_clnt_connection_cleanup at the time
|
|
|
e7a346 |
+ of destroying saved frames
|
|
|
e7a346 |
+ */
|
|
|
e7a346 |
+ pthread_mutex_lock (&conn->lock);
|
|
|
e7a346 |
+ {
|
|
|
e7a346 |
+ saved_frames = conn->saved_frames;
|
|
|
e7a346 |
+ conn->saved_frames = NULL;
|
|
|
e7a346 |
+ }
|
|
|
e7a346 |
+ pthread_mutex_unlock (&conn->lock);
|
|
|
e7a346 |
+
|
|
|
e7a346 |
+ saved_frames_destroy (saved_frames);
|
|
|
e7a346 |
pthread_mutex_destroy (&rpc->lock);
|
|
|
e7a346 |
pthread_mutex_destroy (&rpc->conn.lock);
|
|
|
e7a346 |
|
|
|
e7a346 |
--
|
|
|
e7a346 |
1.8.3.1
|
|
|
e7a346 |
|