[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  461a117 s3: smbd: Fix memory leak in vfswrap_getwd()
      from  5bba8c3 s3:smb2_tcon: Add check to prevent non-DFS clients from connecting to an msdfs proxy.

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 461a1172ff819692aa0a2dc5ce7fc5379c8a529e
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Apr 6 13:52:52 2018 -0700

    s3: smbd: Fix memory leak in vfswrap_getwd()
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13372
    
    Signed-off-by: Andrew Walker <awalker at ixsystems.com>.
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Mon Apr  9 21:48:12 CEST 2018 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_default.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index a26bec4..a9c87e4 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;
 }
 


-- 
Samba Shared Repository