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

s3:smb2_server: remember the max_{trans,read,write} sizes we negotiated (bug #8473)

Browse Source 
We should enforce the negotiated max sizes instead of the
lp_smb2_max_*() sizes.

metze
This commit is contained in:
Stefan Metzmacher 2011-09-23 17:18:14 +02:00
parent 77f739f03a
commit 40ea66c5dd
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source3/smbd/globals.h
View File

@ -610,6 +610,9 @@ struct smbd_server_connection {
uint64_t seqnum_low;
uint32_t credits_granted;
uint32_t max_credits;
uint32_t max_trans;
uint32_t max_read;
uint32_t max_write;
struct bitmap *credits_bitmap;
bool compound_related_in_progress;
} smb2;

2
source3/smbd/smb2_find.c
View File

@ -281,7 +281,7 @@ static struct tevent_req *smbd_smb2_find_send(TALLOC_CTX *mem_ctx,
return tevent_req_post(req, ev);
}
if (in_output_buffer_length > lp_smb2_max_trans()) {
if (in_output_buffer_length > smb2req->sconn->smb2.max_trans) {
tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
return tevent_req_post(req, ev);
}

4
source3/smbd/smb2_negprot.c
View File

@ -101,7 +101,6 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
uint32_t max_read = lp_smb2_max_read();
uint32_t max_write = lp_smb2_max_write();
status = smbd_smb2_request_verify_sizes(req, 0x24);
if (!NT_STATUS_IS_OK(status)) {
return smbd_smb2_request_error(req, status);
@ -245,6 +244,9 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
outdyn = security_buffer;
req->sconn->using_smb2 = true;
req->sconn->smb2.max_trans = max_trans;
req->sconn->smb2.max_read = max_read;
req->sconn->smb2.max_write = max_write;
return smbd_smb2_request_done(req, outbody, &outdyn);
}

2
source3/smbd/smb2_notify.c
View File

@ -73,7 +73,7 @@ NTSTATUS smbd_smb2_request_process_notify(struct smbd_smb2_request *req)
* 0x00010000 is what Windows 7 uses,
* Windows 2008 uses 0x00080000
*/
if (in_output_buffer_length > lp_smb2_max_trans()) {
if (in_output_buffer_length > req->sconn->smb2.max_trans) {
return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
}

4
source3/smbd/smb2_read.c
View File

@ -74,9 +74,9 @@ NTSTATUS smbd_smb2_request_process_read(struct smbd_smb2_request *req)
in_remaining_bytes = IVAL(inbody, 0x28);
/* check the max read size */
if (in_length > lp_smb2_max_read()) {
if (in_length > req->sconn->smb2.max_read) {
DEBUG(0,("here:%s: 0x%08X: 0x%08X\n",
__location__, in_length, lp_smb2_max_read()));
__location__, in_length, req->sconn->smb2.max_read));
return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
}

5
source3/smbd/smb2_write.c
View File

@ -78,11 +78,10 @@ NTSTATUS smbd_smb2_request_process_write(struct smbd_smb2_request *req)
}
/* check the max write size */
if (in_data_length > lp_smb2_max_write()) {
/* This is a warning. */
if (in_data_length > req->sconn->smb2.max_write) {
DEBUG(2,("smbd_smb2_request_process_write : "
"client ignored max write :%s: 0x%08X: 0x%08X\n",
__location__, in_data_length, lp_smb2_max_write()));
__location__, in_data_length, req->sconn->smb2.max_write));
#if 0
return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
#endif