From ba7a337ab250761492b153c1caee0c21b28e08a1 Mon Sep 17 00:00:00 2001 From: Mohammed Rafi KC Date: Tue, 2 Aug 2016 11:59:42 +0530 Subject: meta: fix memory leak in meta xlators meta xlator is leaking iobuf and iobrefs in read path This patch fixes memleak in meta_default_read code path Backport of> >Change-Id: Ieb413267604d9870dbe6e11258fffd279a7bd7cf >BUG: 1362397 >Signed-off-by: Mohammed Rafi KC >Reviewed-on: http://review.gluster.org/15068 >Smoke: Gluster Build System >Reviewed-by: Pranith Kumar Karampuri >CentOS-regression: Gluster Build System >NetBSD-regression: NetBSD Build System >Reviewed-by: Poornima G (cherry picked from commit d297d2bdfc4d5ba99c37b22dd1ae0f8e8e92fe7b) Change-Id: I1141d3770f2d0f24ac5954d12a6bb3cc4a900f44 BUG: 1365734 Signed-off-by: Mohammed Rafi KC Reviewed-on: http://review.gluster.org/15123 Smoke: Gluster Build System Tested-by: Oleksandr Natalenko NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Vijay Bellur Reviewed-by: Prashanth Pai Reviewed-by: Niels de Vos --- xlators/meta/src/meta-defaults.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'xlators') diff --git a/xlators/meta/src/meta-defaults.c b/xlators/meta/src/meta-defaults.c index 5a8558291ba..045fe79dbbc 100644 --- a/xlators/meta/src/meta-defaults.c +++ b/xlators/meta/src/meta-defaults.c @@ -148,6 +148,9 @@ meta_default_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, return default_readv_failure_cbk (frame, ENOMEM); } + /* iobref would have taken a ref */ + iobuf_unref (iobuf); + iov.iov_base = iobuf_ptr (iobuf); copy_offset = min (meta_fd->size, offset); @@ -159,6 +162,8 @@ meta_default_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, META_STACK_UNWIND (readv, frame, copy_size, 0, &iov, 1, &iatt, iobref, 0); + iobref_unref (iobref); + return 0; } -- cgit