sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

smbd/aio: Do not go async for SMB2 compound requests

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13047

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Christof Schmitt 2017-09-21 12:08:01 -07:00 committed by Jeremy Allison
parent cfa2c30830
commit a2b081e159
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/smbd/aio.c
View File

@ -697,6 +697,10 @@ NTSTATUS schedule_smb2_aio_read(connection_struct *conn,
return NT_STATUS_RETRY; return NT_STATUS_RETRY;
} }
if (smbd_smb2_is_compound(smbreq->smb2req)) {
return NT_STATUS_RETRY;
}
/* Create the out buffer. */ /* Create the out buffer. */
*preadbuf = data_blob_talloc(ctx, NULL, smb_maxcnt); *preadbuf = data_blob_talloc(ctx, NULL, smb_maxcnt);
if (preadbuf->data == NULL) { if (preadbuf->data == NULL) {
@ -841,6 +845,10 @@ NTSTATUS schedule_aio_smb2_write(connection_struct *conn,
return NT_STATUS_RETRY; return NT_STATUS_RETRY;
} }
if (smbd_smb2_is_compound(smbreq->smb2req)) {
return NT_STATUS_RETRY;
}
if (smbreq->unread_bytes) { if (smbreq->unread_bytes) {
/* Can't do async with recvfile. */ /* Can't do async with recvfile. */
return NT_STATUS_RETRY; return NT_STATUS_RETRY;