From d31c45e659d0fd0b740ecfb98b3b92dc8dcca039 Mon Sep 17 00:00:00 2001 From: Xavier Hernandez Date: Tue, 12 Sep 2017 14:53:41 +0200 Subject: glusterd: fix invalid memory reference returned > BUG: 1490897 > Reviewed-on: https://review.gluster.org/18263 > Smoke: Gluster Build System > CentOS-regression: Gluster Build System > Reviewed-by: Jeff Darcy > Reviewed-by: Gaurav Yadav Change-Id: I0823c7b33060b48040c1d86ad346a5f6e15bc190 BUG: 1491166 Signed-off-by: Xavier Hernandez Reviewed-on: https://review.gluster.org/18281 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Jeff Darcy --- xlators/mgmt/glusterd/src/glusterd-handshake.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c index c59719a814a..7f635dcd3de 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handshake.c +++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c @@ -441,6 +441,7 @@ glusterd_get_args_from_dict (gf_getspec_req *args, peer_info_t *peerinfo, int client_min_op_version = 1; int32_t ret = -1; xlator_t *this = NULL; + char *name = NULL; this = THIS; GF_ASSERT (this); @@ -485,14 +486,18 @@ glusterd_get_args_from_dict (gf_getspec_req *args, peer_info_t *peerinfo, goto out; } - ret = dict_get_str (dict, "brick_name", - brick_name); + ret = dict_get_str (dict, "brick_name", &name); if (ret) { gf_msg_debug (this->name, 0, "No brick name present"); ret = 0; goto out; } + *brick_name = gf_strdup(name); + if (*brick_name == NULL) { + ret = -1; + goto out; + } gf_msg_debug (this->name, 0, "brick_name = %s", *brick_name); out: @@ -943,6 +948,8 @@ fail: if (spec_fd > 0) sys_close (spec_fd); + GF_FREE(brick_name); + rsp.op_ret = ret; if (op_errno) -- cgit