[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  660dbfa s3: smbd: Prevent valgrind errors in smbtorture3 POSIX test.
      from  34cbd89 libcli: Add debug message if fail to negoatiate SMB protocol

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


- Log -----------------------------------------------------------------
commit 660dbfaeff493359474ebdb36098ac49b3f7ba0c
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Sep 27 14:12:47 2018 -0700

    s3: smbd: Prevent valgrind errors in smbtorture3 POSIX test.
    
    Missing fsp talloc free and linked list delete in error
    paths in close_directory(). Now matches close_normal_file()
    and close_fake_file().
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=13633
    
    Signed-off-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): Sat Sep 29 05:32:41 CEST 2018 on sn-devel-144

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

Summary of changes:
 source3/smbd/close.c | 4 ++++
 1 file changed, 4 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 742b3f0..f2f0a43 100644
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1124,6 +1124,8 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp,
 	if (lck == NULL) {
 		DEBUG(0, ("close_directory: Could not get share mode lock for "
 			  "%s\n", fsp_str_dbg(fsp)));
+		close_filestruct(fsp);
+		file_free(req, fsp);
 		return NT_STATUS_INVALID_PARAMETER;
 	}
 
@@ -1183,6 +1185,8 @@ static NTSTATUS close_directory(struct smb_request *req, files_struct *fsp,
 			if (!NT_STATUS_IS_OK(status)) {
 				DEBUG(5, ("delete_all_streams failed: %s\n",
 					  nt_errstr(status)));
+				close_filestruct(fsp);
+				file_free(req, fsp);
 				return status;
 			}
 		}


-- 
Samba Shared Repository