From: Jeremy Allison <jra@samba.org>
Date: Fri, 6 Apr 2018 20:52:52 +0000 (-0700)
Subject: s3: smbd: Fix memory leak in vfswrap_getwd()
X-Git-Tag: ldb-1.4.0~670
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=461a1172ff819692aa0a2dc5ce7fc5379c8a529e;p=thirdparty%2Fsamba.git

s3: smbd: Fix memory leak in vfswrap_getwd()

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13372

Signed-off-by: Andrew Walker <awalker@ixsystems.com>.
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Apr  9 21:48:12 CEST 2018 on sn-devel-144
---

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index a26bec457ae..a9c87e444fe 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -2229,9 +2229,12 @@ static struct smb_filename *vfswrap_getwd(vfs_handle_struct *handle,
 				NULL,
 				NULL,
 				0);
-	if (smb_fname == NULL) {
-		SAFE_FREE(result);
-	}
+	/*
+	 * sys_getwd() *always* returns malloced memory.
+	 * We must free here to avoid leaks:
+	 * BUG:https://bugzilla.samba.org/show_bug.cgi?id=13372
+	 */
+	SAFE_FREE(result);
 	return smb_fname;
 }