sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

s3:smbd: fix SMB2 aio cancelling

Browse Source 
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>
This commit is contained in:
Ralph Boehme 2018-10-28 19:35:59 +01:00 committed by Jeremy Allison
parent e37ff8c5fe
commit 07eb805cde
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail.d/samba3.smb2
View File

@ -1 +0,0 @@
^samba3.smb2.aio_delay.aio_cancel\(nt4_dc\)

12
source3/smbd/aio.c
View File

@ -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);