s3: smbd: Ensure we remove any pending aio values for named pipes on forced shutdown.

Matches file and directory closes.

Remove knownfail.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15423

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): Wed Sep 20 02:43:18 UTC 2023 on atb-devel-224

(cherry picked from commit 11280f1705c0faa1729f5aeaa1b6a1f79ab5a199)

Autobuild-User(v4-18-test): Jule Anger <janger@samba.org>
Autobuild-Date(v4-18-test): Wed Sep 20 21:38:55 UTC 2023 on atb-devel-224

diff --git a/selftest/knownfail.d/smb2_pipe_read_async_disconnect b/selftest/knownfail.d/smb2_pipe_read_async_disconnect
deleted file mode 100644 (file)
index 342a308..0000000
--- a/selftest/knownfail.d/smb2_pipe_read_async_disconnect
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.smbtorture_s3.plain.SMB2-PIPE-READ-ASYNC-DISCONNECT.check_panic\(fileserver\)

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index d1e893257809e8a0bb95a05cec7b5c08a57684ff..b42f4d2db71ecaa1fae75b267ddbfe9d14ae2903 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -1634,6 +1634,14 @@ NTSTATUS close_file_smb(struct smb_request *req,
        SMB_ASSERT(fsp->stream_fsp == NULL);
 
        if (fsp->fake_file_handle != NULL) {
+               /*
+                * Named pipes are opened as fake files and
+                * can have pending aio requests. Ensure
+                * we clear out all pending aio on force
+                * shutdown of named pipes also.
+                * BUG: https://bugzilla.samba.org/show_bug.cgi?id=15423
+                */
+               assert_no_pending_aio(fsp, close_type);
                status = close_fake_file(req, fsp);
        } else if (fsp->print_file != NULL) {
                /* FIXME: return spool errors */