From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 21 Dec 2020 14:31:25 +0000 (+0100)
Subject: s3:smbd: make sure openat_pathref_fsp() calls fd_close(fsp->base_fsp);
X-Git-Tag: samba-4.14.0rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b1dc2a4ca61aaa96c3e731a7a59da2a21aa522d;p=thirdparty%2Fsamba.git

s3:smbd: make sure openat_pathref_fsp() calls fd_close(fsp->base_fsp);

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/files.c b/source3/smbd/files.c
index 122afa4f3d6..bb61fd49c9c 100644
--- a/source3/smbd/files.c
+++ b/source3/smbd/files.c
@@ -479,10 +479,10 @@ NTSTATUS openat_pathref_fsp(const struct files_struct *dirfsp,
 			  nt_errstr(status));
 
 		if (fsp->base_fsp != NULL) {
+			fd_close(fsp->base_fsp);
 			file_free(NULL, fsp->base_fsp);
 			fsp->base_fsp = NULL;
 		}
-		fd_close(fsp);
 		file_free(NULL, fsp);
 		fsp = NULL;
 
@@ -547,6 +547,7 @@ fail:
 		return status;
 	}
 	if (fsp->base_fsp != NULL) {
+		fd_close(fsp->base_fsp);
 		file_free(NULL, fsp->base_fsp);
 		fsp->base_fsp = NULL;
 	}