s3:smb2_server: use smbd_smb2_request_verify_sizes() in smb2_flush.c
authorStefan Metzmacher <metze@samba.org>
Tue, 6 Sep 2011 12:01:43 +0000 (14:01 +0200)
committerStefan Metzmacher <metze@samba.org>
Wed, 7 Sep 2011 08:38:05 +0000 (10:38 +0200)
metze

source3/smbd/smb2_flush.c

index c3f5a301290d24348d1cb2f390a7b3f32a03e7a2..9b00eb2878945e674ae9ffef5b4742a0bd185d3d 100644 (file)
@@ -33,27 +33,19 @@ static NTSTATUS smbd_smb2_flush_recv(struct tevent_req *req);
 static void smbd_smb2_request_flush_done(struct tevent_req *subreq);
 NTSTATUS smbd_smb2_request_process_flush(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 = 0x18;
-       size_t body_size;
        uint64_t in_file_id_persistent;
        uint64_t in_file_id_volatile;
        struct tevent_req *subreq;
 
-       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, 0x18);
+       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_id_persistent   = BVAL(inbody, 0x08);
        in_file_id_volatile     = BVAL(inbody, 0x10);