Attachment 12571 Details for Bug 12377 – Cherry-picked patch from master

[patch] Cherry-picked patch from master

0001-vfs_glusterfs-Fix-a-memory-leak-in-connect-path.patch (text/plain), 1.29 KB, created by Anoop C S on 2016-10-13 14:55:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anoop C S

Created: 2016-10-13 14:55:26 UTC

Size: 1.29 KB

patch

obsolete

>From e631ba6e8d244a645536724001fc7b3e713389bd Mon Sep 17 00:00:00 2001
>From: Anoop C S <anoopcs@redhat.com>
>Date: Fri, 7 Oct 2016 16:05:29 +0530
>Subject: [PATCH] vfs_glusterfs: Fix a memory leak in connect path
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Early return in case of failure to set snapdir-entry-path xlator option
>leaks talloced tmp_ctx.
>
>Signed-off-by: Anoop C S <anoopcs@redhat.com>
>Reviewed-by: Guenther Deschner <gd@samba.org>
>Reviewed-by: Andreas Schneider <asn@samba.org>
>
>Autobuild-User(master): GÃ¼nther Deschner <gd@samba.org>
>Autobuild-Date(master): Fri Oct  7 19:39:11 CEST 2016 on sn-devel-144
>
>(cherry picked from commit 06281e8f1b912540a8cc2a79497b074dbe559d53)
>---
> source3/modules/vfs_glusterfs.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
>diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
>index 84530a8..8e4e3cc 100644
>--- a/source3/modules/vfs_glusterfs.c
>+++ b/source3/modules/vfs_glusterfs.c
>@@ -223,8 +223,7 @@ static int vfs_gluster_connect(struct vfs_handle_struct *handle,
> 	if (ret < 0) {
> 		DEBUG(0, ("%s: Failed to set xlator option:"
> 			  " snapdir-entry-path\n", volume));
>-		glfs_fini(fs);
>-		return -1;
>+		goto done;
> 	}
> 
> 	ret = glfs_set_logging(fs, logfile, loglevel);
>-- 
>2.7.4
>

Flags:

gd: review+

Actions: View

Attachments on bug 12377: 12571 | 12572