diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-09-06 14:01:43 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-09-07 10:38:05 +0200 |
| commit | bc95ab99dc84fa6d567a7d4e803552363bbc07a9 (patch) | |
| tree | 3933acc34d611ee4df479fcccc959c5ae221ee41 | |
| parent | 251815bfd395398857cb60c0b89710ddce7ab19f (diff) | |
| download | samba-bc95ab99dc84fa6d567a7d4e803552363bbc07a9.tar.gz samba-bc95ab99dc84fa6d567a7d4e803552363bbc07a9.tar.bz2 samba-bc95ab99dc84fa6d567a7d4e803552363bbc07a9.zip | |
s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_find.c
metze
| -rw-r--r-- | source3/smbd/smb2_find.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/source3/smbd/smb2_find.c b/source3/smbd/smb2_find.c index 9fc8f1fef2..8bfb45b75a 100644 --- a/source3/smbd/smb2_find.c +++ b/source3/smbd/smb2_find.c @@ -41,11 +41,9 @@ static NTSTATUS smbd_smb2_find_recv(struct tevent_req *req, static void smbd_smb2_request_find_done(struct tevent_req *subreq); NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req) { - const uint8_t *inhdr; + NTSTATUS status; const uint8_t *inbody; int i = req->current_idx; - size_t expected_body_size = 0x21; - size_t body_size; uint8_t in_file_info_class; uint8_t in_flags; uint32_t in_file_index; @@ -60,18 +58,12 @@ NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req) struct tevent_req *subreq; bool ok; - inhdr = (const uint8_t *)req->in.vector[i+0].iov_base; - if (req->in.vector[i+1].iov_len != (expected_body_size & 0xFFFFFFFE)) { - return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER); + status = smbd_smb2_request_verify_sizes(req, 0x21); + if (!NT_STATUS_IS_OK(status)) { + return smbd_smb2_request_error(req, status); } - inbody = (const uint8_t *)req->in.vector[i+1].iov_base; - body_size = SVAL(inbody, 0x00); - if (body_size != expected_body_size) { - return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER); - } - in_file_info_class = CVAL(inbody, 0x02); in_flags = CVAL(inbody, 0x03); in_file_index = IVAL(inbody, 0x04); @@ -84,7 +76,7 @@ NTSTATUS smbd_smb2_request_process_find(struct smbd_smb2_request *req) if (in_file_name_offset == 0 && in_file_name_length == 0) { /* This is ok */ } else if (in_file_name_offset != - (SMB2_HDR_BODY + (body_size & 0xFFFFFFFE))) { + (SMB2_HDR_BODY + req->in.vector[i+1].iov_len)) { return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER); } |