sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

s3:smb2_server: fix drain_socket error handling

Browse Source 
smbd_smb2_request_error_ex() should return NTSTATUS and the caller
will terminate the connection.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
This commit is contained in:
Stefan Metzmacher 2013-10-14 16:42:55 +02:00
parent 22ee3b472d
commit 9393e28df5
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/smbd/smb2_server.c
View File

@ -2644,10 +2644,24 @@ NTSTATUS smbd_smb2_request_error_ex(struct smbd_smb2_request *req,
if (unread_bytes) {
/* Recvfile error. Drain incoming socket. */
size_t ret = drain_socket(req->sconn->sock, unread_bytes);
size_t ret;
errno = 0;
ret = drain_socket(req->sconn->sock, unread_bytes);
if (ret != unread_bytes) {
smbd_server_connection_terminate(req->sconn,
"Failed to drain SMB2 socket\n");
NTSTATUS error;
if (errno == 0) {
error = NT_STATUS_IO_DEVICE_ERROR;
} else {
error = map_nt_error_from_unix_common(errno);
}
DEBUG(2, ("Failed to drain %u bytes from SMB2 socket: "
"ret[%u] errno[%d] => %s\n",
(unsigned)unread_bytes,
(unsigned)ret, errno, nt_errstr(error)));
return error;
}
}