diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-12-06 14:17:06 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:09 -0500 |
| commit | 6b1ee03c53223fb6adcd8f485808536942bad6b8 (patch) | |
| tree | 4b01641aaa0c23bef6c67fae1f93a1f4b8e2a691 /source4/smb_server/smb2 | |
| parent | 05bfa9ad863d6d7afc20ff3f76816750afcac64b (diff) | |
| download | samba-6b1ee03c53223fb6adcd8f485808536942bad6b8.tar.gz samba-6b1ee03c53223fb6adcd8f485808536942bad6b8.tar.bz2 samba-6b1ee03c53223fb6adcd8f485808536942bad6b8.zip | |
r12095: the most SMB2 opcodes need a valid session and tcon,
metze
(This used to be commit 40b301c6bdb329ad347ac8a474be85dcbc671518)
Diffstat (limited to 'source4/smb_server/smb2')
| -rw-r--r-- | source4/smb_server/smb2/receive.c | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/source4/smb_server/smb2/receive.c b/source4/smb_server/smb2/receive.c index 7544e0be3e..66ebe162cf 100644 --- a/source4/smb_server/smb2/receive.c +++ b/source4/smb_server/smb2/receive.c @@ -120,12 +120,21 @@ void smb2srv_send_error(struct smb2srv_request *req, NTSTATUS error) static NTSTATUS smb2srv_reply(struct smb2srv_request *req) { uint16_t opcode; + uint32_t tid; + uint64_t uid; opcode = SVAL(req->in.hdr, SMB2_HDR_OPCODE); req->seqnum = BVAL(req->in.hdr, SMB2_HDR_SEQNUM); + tid = IVAL(req->in.hdr, SMB2_HDR_TID); + uid = BVAL(req->in.hdr, SMB2_HDR_UID); + + req->session = smbsrv_session_find(req->smb_conn, uid); + req->tcon = smbsrv_tcon_find(req->smb_conn, tid); errno = 0; + /* TODO: check the seqnum */ + switch (opcode) { case SMB2_OP_NEGPROT: smb2srv_negprot_recv(req); @@ -134,54 +143,84 @@ static NTSTATUS smb2srv_reply(struct smb2srv_request *req) smb2srv_sesssetup_recv(req); return NT_STATUS_OK; case SMB2_OP_LOGOFF: + if (!req->session) goto nosession; smb2srv_logoff_recv(req); return NT_STATUS_OK; case SMB2_OP_TCON: + if (!req->session) goto nosession; smb2srv_tcon_recv(req); return NT_STATUS_OK; case SMB2_OP_TDIS: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_tdis_recv(req); return NT_STATUS_OK; case SMB2_OP_CREATE: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_create_recv(req); return NT_STATUS_OK; case SMB2_OP_CLOSE: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_close_recv(req); return NT_STATUS_OK; case SMB2_OP_FLUSH: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_flush_recv(req); return NT_STATUS_OK; case SMB2_OP_READ: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_read_recv(req); return NT_STATUS_OK; case SMB2_OP_WRITE: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_write_recv(req); return NT_STATUS_OK; case SMB2_OP_LOCK: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_lock_recv(req); return NT_STATUS_OK; case SMB2_OP_IOCTL: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_ioctl_recv(req); return NT_STATUS_OK; case SMB2_OP_CANCEL: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_cancel_recv(req); return NT_STATUS_OK; case SMB2_OP_KEEPALIVE: smb2srv_keepalive_recv(req); return NT_STATUS_OK; case SMB2_OP_FIND: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_find_recv(req); return NT_STATUS_OK; case SMB2_OP_NOTIFY: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_notify_recv(req); return NT_STATUS_OK; case SMB2_OP_GETINFO: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_getinfo_recv(req); return NT_STATUS_OK; case SMB2_OP_SETINFO: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_setinfo_recv(req); return NT_STATUS_OK; case SMB2_OP_BREAK: + if (!req->session) goto nosession; + if (!req->tcon) goto notcon; smb2srv_break_recv(req); return NT_STATUS_OK; } @@ -189,6 +228,13 @@ static NTSTATUS smb2srv_reply(struct smb2srv_request *req) DEBUG(1,("Invalid SMB2 opcode: 0x%04X\n", opcode)); smbsrv_terminate_connection(req->smb_conn, "Invalid SMB2 opcode"); return NT_STATUS_OK; + +nosession: + smb2srv_send_error(req, NT_STATUS_USER_SESSION_DELETED); + return NT_STATUS_OK; +notcon: + smb2srv_send_error(req, NT_STATUS_NETWORK_NAME_DELETED); + return NT_STATUS_OK; } NTSTATUS smbsrv_recv_smb2_request(void *private, DATA_BLOB blob) |