s3:smbd: fix SMB2 aio cancelling

As we currently don't attempt to cancel the internal aio request, we
must ignore the SMB2 cancel request and continue to process the SMB2
request, cf MS-SM2 3.3.5.16:

  If the target request is not successfully canceled, processing of the
  target request MUST continue and no response is sent to the cancel
  request.

Bug: https://bugzilla.samba.org/show_bug.cgi?id=13667

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/selftest/knownfail.d/samba3.smb2 b/selftest/knownfail.d/samba3.smb2
deleted file mode 100644 (file)
index f4e2ecf..0000000
--- a/selftest/knownfail.d/samba3.smb2
+++ /dev/null
@@ -1 +0,0 @@
-^samba3.smb2.aio_delay.aio_cancel\(nt4_dc\)

diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c
index c066ea1a97886fcb9695540aa0cc495486c5a7ff..ffa2a683b46acae7f5989fc1ca55a2645c2c5569 100644 (file)
--- a/source3/smbd/aio.c
+++ b/source3/smbd/aio.c
@@ -622,12 +622,16 @@ bool cancel_smb2_aio(struct smb_request *smbreq)
        }
 
        /*
-        * We let the aio request run. Setting fsp to NULL has the
-        * effect that the _done routines don't send anything out.
+        * We let the aio request run and don't try to cancel it which means
+        * processing of the SMB2 request must continue as normal, cf MS-SMB2
+        * 3.3.5.16:
+        *
+        *   If the target request is not successfully canceled, processing of
+        *   the target request MUST continue and no response is sent to the
+        *   cancel request.
         */
 
-       aio_ex->fsp = NULL;
-       return true;
+       return false;
 }
 
 static void aio_pread_smb2_done(struct tevent_req *req);