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

metze

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 4937f4bcbf7bc72d027f847e18d9d4fb101d8a7c..2b32407aad73e51518a9f725efa0e0fba65131bb 100644 (file)
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -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) {