From a1da8e76f768f268d02651b30cef0e04416c9022 Mon Sep 17 00:00:00 2001 From: Vandana Rungta Date: Tue, 8 May 2018 11:27:47 -0700 Subject: [PATCH] s3: VFS: Fix memory leak in vfs_ceph. Centralize error handling. https://bugzilla.samba.org/show_bug.cgi?id=13424 Signed-off-by: Vandana Rungta Reviewed-by: Jeremy Allison Reviewed-by: David Disseldorp Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Wed May 9 04:28:11 CEST 2018 on sn-devel-144 (cherry picked from commit 4e78aeedb8329953df83fc7f2c191b2c97a051d0) --- source3/modules/vfs_ceph.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/source3/modules/vfs_ceph.c b/source3/modules/vfs_ceph.c index 656ce57009f..61df5dedf82 100644 --- a/source3/modules/vfs_ceph.c +++ b/source3/modules/vfs_ceph.c @@ -1252,30 +1252,31 @@ static struct smb_filename *cephwrap_realpath(struct vfs_handle_struct *handle, TALLOC_CTX *ctx, const struct smb_filename *smb_fname) { - char *result; + char *result = NULL; const char *path = smb_fname->base_name; size_t len = strlen(path); struct smb_filename *result_fname = NULL; + int r = -1; - result = SMB_MALLOC_ARRAY(char, PATH_MAX+1); if (len && (path[0] == '/')) { - int r = asprintf(&result, "%s", path); - if (r < 0) return NULL; + r = asprintf(&result, "%s", path); } else if ((len >= 2) && (path[0] == '.') && (path[1] == '/')) { if (len == 2) { - int r = asprintf(&result, "%s", + r = asprintf(&result, "%s", handle->conn->connectpath); - if (r < 0) return NULL; } else { - int r = asprintf(&result, "%s/%s", + r = asprintf(&result, "%s/%s", handle->conn->connectpath, &path[2]); - if (r < 0) return NULL; } } else { - int r = asprintf(&result, "%s/%s", + r = asprintf(&result, "%s/%s", handle->conn->connectpath, path); - if (r < 0) return NULL; } + + if (r < 0) { + return NULL; + } + DBG_DEBUG("[CEPH] realpath(%p, %s) = %s\n", handle, path, result); result_fname = synthetic_smb_fname(ctx, result, -- 2.17.0