diff options
| author | Xavi Hernandez <xhernandez@redhat.com> | 2018-03-09 22:48:33 +0100 |
|---|---|---|
| committer | Xavi Hernandez <xhernandez@redhat.com> | 2018-03-09 23:31:29 +0100 |
| commit | 157e55fe43ba13f04452aa11f42200b279fb4f7a (patch) | |
| tree | 8ea7ab1685741b8236fde8a7accc611e98d73acc /xlators/protocol/client/src/client-rpc-fops_v2.c | |
| parent | 940f870f4716f9cd32c68db95aa326a0ae87bf03 (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-rpc-fops_v2.c')
| -rw-r--r-- | xlators/protocol/client/src/client-rpc-fops_v2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xlators/protocol/client/src/client-rpc-fops_v2.c b/xlators/protocol/client/src/client-rpc-fops_v2.c index aad1666096b..15f1c956101 100644 --- a/xlators/protocol/client/src/client-rpc-fops_v2.c +++ b/xlators/protocol/client/src/client-rpc-fops_v2.c @@ -2758,7 +2758,7 @@ client4_0_releasedir (call_frame_t *frame, xlator_t *this, args = data; conf = this->private; - pthread_mutex_lock (&conf->lock); + pthread_spin_lock (&conf->fd_lock); { fdctx = this_fd_del_ctx (args->fd, this); if (fdctx != NULL) { @@ -2777,7 +2777,7 @@ client4_0_releasedir (call_frame_t *frame, xlator_t *this, } } } - pthread_mutex_unlock (&conf->lock); + pthread_spin_unlock (&conf->fd_lock); if (destroy) client_fdctx_destroy (this, fdctx); @@ -2803,7 +2803,7 @@ client4_0_release (call_frame_t *frame, xlator_t *this, args = data; conf = this->private; - pthread_mutex_lock (&conf->lock); + pthread_spin_lock (&conf->fd_lock); { fdctx = this_fd_del_ctx (args->fd, this); if (fdctx != NULL) { @@ -2821,7 +2821,7 @@ client4_0_release (call_frame_t *frame, xlator_t *this, } } } - pthread_mutex_unlock (&conf->lock); + pthread_spin_unlock (&conf->fd_lock); if (destroy) client_fdctx_destroy (this, fdctx); |