sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

s3:smb2_server: allow logoff, close, unlock, cancel and echo on expired sessions

Browse Source 
Windows client at least doesn't have code to replay
a SMB2 Close after getting NETWORK_SESSION_EXPIRED,
which locks out a the client and generates an endless
loop around NT_STATUS_SHARING_VIOLATION.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Dec 21 23:28:42 CET 2017 on sn-devel-144
This commit is contained in:
Stefan Metzmacher 2017-12-20 14:05:54 +01:00 committed by Jeremy Allison
parent cfaba68478
commit c4919d4d5f
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
selftest/knownfail.d/session.expire2
View File

@ -1 +0,0 @@
^samba3.smb2.session.*krb5.expire2

17
source3/smbd/smb2_lock.c
View File

@ -98,6 +98,23 @@ NTSTATUS smbd_smb2_request_process_lock(struct smbd_smb2_request *req)
in_locks[l].flags = IVAL(lock_buffer, 0x10);
/* 0x14 - 4 reserved bytes */
status = req->session->status;
if (NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_SESSION_EXPIRED)) {
/*
* We need to catch NT_STATUS_NETWORK_SESSION_EXPIRED
* for lock requests only.
*
* Unlock requests still need to be processed!
*
* This means smbd_smb2_request_check_session()
* can't handle the difference and always
* allows SMB2_OP_LOCK.
*/
if (in_locks[0].flags != SMB2_LOCK_FLAG_UNLOCK) {
return smbd_smb2_request_error(req, status);
}
}
lock_buffer = SMBD_SMB2_IN_DYN_PTR(req);
for (l=1; l < in_lock_count; l++) {

19
source3/smbd/smb2_server.c
View File

@ -1902,6 +1902,25 @@ static NTSTATUS smbd_smb2_request_check_session(struct smbd_smb2_request *req)
case SMB2_OP_SESSSETUP:
status = NT_STATUS_OK;
break;
case SMB2_OP_LOGOFF:
case SMB2_OP_CLOSE:
case SMB2_OP_LOCK:
case SMB2_OP_CANCEL:
case SMB2_OP_KEEPALIVE:
/*
* [MS-SMB2] 3.3.5.2.9 Verifying the Session
* specifies that LOGOFF, CLOSE and (UN)LOCK
* should always be processed even on expired sessions.
*
* Also see the logic in
* smbd_smb2_request_process_lock().
*
* The smb2.session.expire2 test shows that
* CANCEL and KEEPALIVE/ECHO should also
* be processed.
*/
status = NT_STATUS_OK;
break;
default:
break;
}