summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2016-12-16 09:31:41 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-12-16 01:07:27 -0800
commit2d87431c51328e419ae08932589fe81d29ef742b (patch)
treeb8deff44dc649eab561463b91c91129132cff830 /xlators
parentd2dff6320adc5c58ed8ed68dc1d3209149c29584 (diff)
protocol/client: Fix potential mem-leaks
Commit 93eaeb9c93be3232f24e840044d560f9f0e66f71 introduces leaks in INODELK callback where a dict is unserialized twice, leading to dict leaks. Change-Id: I219ccb2279f237ebc2e4fc366af4775a461929b8 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/16156 Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/protocol/client/src/client-handshake.c1
-rw-r--r--xlators/protocol/client/src/client-rpc-fops.c4
2 files changed, 1 insertions, 4 deletions
diff --git a/xlators/protocol/client/src/client-handshake.c b/xlators/protocol/client/src/client-handshake.c
index 00299d15743..c28fa5dd7cd 100644
--- a/xlators/protocol/client/src/client-handshake.c
+++ b/xlators/protocol/client/src/client-handshake.c
@@ -86,6 +86,7 @@ out:
/* Don't use 'GF_FREE', this is allocated by libc */
free (rsp.spec);
+ free (rsp.xdata.xdata_val);
return 0;
}
diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c
index 0ae5659fb97..28952648786 100644
--- a/xlators/protocol/client/src/client-rpc-fops.c
+++ b/xlators/protocol/client/src/client-rpc-fops.c
@@ -1531,10 +1531,6 @@ client3_3_inodelk_cbk (struct rpc_req *req, struct iovec *iov, int count,
goto out;
}
- GF_PROTOCOL_DICT_UNSERIALIZE (this, xdata, (rsp.xdata.xdata_val),
- (rsp.xdata.xdata_len), ret,
- rsp.op_errno, out);
-
ret = client_post_inodelk (this, &rsp, &xdata);
if (ret < 0)
goto out;