summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra G <rgowdapp@redhat.com>2016-01-14 16:11:27 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-01-19 23:01:26 -0800
commit320f684a5eec9c6d39c674a93d48783301db5157 (patch)
treeee71b797455462bbf14d3185bcee34ab48a359e0
parentb273915811fc484698a46f36597581dd0a5753e7 (diff)
protocol/server: Fix memory corruption during client-table-expand.
gf_client_clienttable_expand frees up old entries after expanding. So, cliententry should be reassigned to a free slot in new array of cliententries. Earlier it used to point to a slot in oldentries resulting in a use-after-free bug. Thanks to Pranith for the assistance provided. Change-Id: Iabe40c7df475471a7df7bccb302aef496ded3f1c BUG: 1299314 Signed-off-by: Raghavendra G <rgowdapp@redhat.com> Reviewed-on: http://review.gluster.org/13249 Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
-rw-r--r--libglusterfs/src/client_t.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libglusterfs/src/client_t.c b/libglusterfs/src/client_t.c
index c6997c0b7b0..a14e220d89d 100644
--- a/libglusterfs/src/client_t.c
+++ b/libglusterfs/src/client_t.c
@@ -270,6 +270,7 @@ gf_client_get (xlator_t *this, struct rpcsvc_auth_data *cred, char *client_uid)
errno = result;
goto unlock;
}
+ cliententry = &clienttable->cliententries[client->tbl_index];
cliententry->next_free = clienttable->first_free;
}
cliententry->client = client;