s3: smbd: Ignore fstat() error on deleted stream in fd_close().

[metze/samba-autobuild-v4-18-test/.git] / source3 / smbd / open.c

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 0c9ddfe7c948123318b136dbe34d60b0f49963ac..c848243c9b584e33ccf642785fb221e9ab970b74 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -997,7 +997,20 @@ NTSTATUS fd_close(files_struct *fsp)
        if (fsp->fsp_flags.fstat_before_close) {
                status = vfs_stat_fsp(fsp);
                if (!NT_STATUS_IS_OK(status)) {
-                       return status;
+                       /*
+                        * If this is a stream and delete-on-close was set, the
+                        * backing object (an xattr from streams_xattr) might
+                        * already be deleted so fstat() fails with
+                        * NT_STATUS_NOT_FOUND. So if fsp refers to a stream we
+                        * ignore the error and only bail for normal files where
+                        * an fstat() should still work. NB. We cannot use
+                        * fsp_is_alternate_stream(fsp) for this as the base_fsp
+                        * has already been closed at this point and so the value
+                        * fsp_is_alternate_stream() checks for is already NULL.
+                        */
+                       if (fsp->fsp_name->stream_name == NULL) {
+                               return status;
+                       }
                }
        }