summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/client/src/client-handshake.c
diff options
context:
space:
mode:
authorXavi Hernandez <xhernandez@redhat.com>2018-03-09 22:48:33 +0100
committerXavi Hernandez <xhernandez@redhat.com>2018-03-09 23:31:29 +0100
commit157e55fe43ba13f04452aa11f42200b279fb4f7a (patch)
tree8ea7ab1685741b8236fde8a7accc611e98d73acc /xlators/protocol/client/src/client-handshake.c
parent940f870f4716f9cd32c68db95aa326a0ae87bf03 (diff)
protocol/client: fix memory corruption
There was an issue when some accesses to saved_fds list were protected by the wrong mutex (lock instead of fd_lock). Additionally, the retrieval of fdctx from fd's context and any checks done on it have also been protected by fd_lock to avoid fdctx to become outdated just after retrieving it. Change-Id: If2910508bcb7d1ff23debb30291391f00903a6fe BUG: 1553129 Signed-off-by: Xavi Hernandez <xhernandez@redhat.com>
Diffstat (limited to 'xlators/protocol/client/src/client-handshake.c')
-rw-r--r--xlators/protocol/client/src/client-handshake.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 74c601b..5c0b475 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -926,11 +926,14 @@ client_attempt_reopen (fd_t *fd, xlator_t *this)
conf = this->private;
- fdctx = this_fd_get_ctx (fd, this);
- if (!fdctx)
- goto out;
pthread_spin_lock (&conf->fd_lock);
{
+ fdctx = this_fd_get_ctx (fd, this);
+ if (!fdctx) {
+ pthread_spin_unlock(&conf->fd_lock);
+ goto out;
+ }
+
if (__is_fd_reopen_in_progress (fdctx))
goto unlock;
if (fdctx->remote_fd != -1)