s3: smbd: Prevent valgrind errors in smbtorture3 POSIX test.
authorJeremy Allison <jra@samba.org>
Thu, 27 Sep 2018 21:12:47 +0000 (14:12 -0700)
committerJeremy Allison <jra@samba.org>
Sat, 29 Sep 2018 03:32:41 +0000 (05:32 +0200)
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@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Sat Sep 29 05:32:41 CEST 2018 on sn-devel-144

source3/smbd/close.c

index 742b3f087152c6f246a90f57ffebf5c8ad3ccc38..f2f0a43181e4b274222ee894a26c5c9782557a3f 100644 (file)
@@ -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;
                        }
                }