sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-03 12:58:35 +03:00
Code

s3:smb2_server: make use of helper macros in smbd_smb2_request_validate()

Browse Source 
metze
This commit is contained in:
Stefan Metzmacher 2012-08-07 12:30:54 +02:00
parent 4e6e1ecb6e
commit efaea8e0e1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/smbd/smb2_server.c
View File

@ -590,18 +590,20 @@ static NTSTATUS smbd_smb2_request_validate(struct smbd_smb2_request *req)
}
for (idx=1; idx < count; idx += SMBD_SMB2_NUM_IOV_PER_REQ) {
struct iovec *hdr = SMBD_SMB2_IDX_HDR_IOV(req,in,idx);
struct iovec *body = SMBD_SMB2_IDX_BODY_IOV(req,in,idx);
const uint8_t *inhdr = NULL;
uint32_t flags;
if (req->in.vector[idx].iov_len != SMB2_HDR_BODY) {
if (hdr->iov_len != SMB2_HDR_BODY) {
return NT_STATUS_INVALID_PARAMETER;
}
if (req->in.vector[idx+1].iov_len < 2) {
if (body->iov_len < 2) {
return NT_STATUS_INVALID_PARAMETER;
}
inhdr = (const uint8_t *)req->in.vector[idx].iov_base;
inhdr = (const uint8_t *)hdr->iov_base;
/* Check the SMB2 header */
if (IVAL(inhdr, SMB2_HDR_PROTOCOL_ID) != SMB2_MAGIC) {