Changeset 751 for trunk/server/source3/smbd/smb2_flush.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/smbd/smb2_flush.c (modified) (7 diffs)

trunk/server/source3/smbd/smb2_flush.c

@@ -28 +28 @@
                                                struct tevent_context *ev,
                                                struct smbd_smb2_request *smb2req,
-                                               uint64_t in_file_id_volatile);
+                                               struct files_struct *fsp);
 static NTSTATUS smbd_smb2_flush_recv(struct tevent_req *req);
 
@@ -34 +34 @@
 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 files_struct *in_fsp;
         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);
 
-        if (req->compat_chain_fsp) {
-                /* skip check */
-        } else if (in_file_id_persistent != in_file_id_volatile) {
+        in_fsp = file_fsp_smb2(req, in_file_id_persistent, in_file_id_volatile);
+        if (in_fsp == NULL) {
                 return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
         }
 
-        subreq = smbd_smb2_flush_send(req,
-                                      req->sconn->smb2.event_ctx,
-                                      req,
-                                      in_file_id_volatile);
+        subreq = smbd_smb2_flush_send(req, req->sconn->smb2.event_ctx,
+                                      req, in_fsp);
         if (subreq == NULL) {
                 return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
@@ -96 +86 @@
         }
 
-        outbody = data_blob_talloc(req->out.vector, NULL, 0x10);
+        outbody = data_blob_talloc(req->out.vector, NULL, 0x04);
         if (outbody.data == NULL) {
                 error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
@@ -125 +115 @@
                                                struct tevent_context *ev,
                                                struct smbd_smb2_request *smb2req,
-                                               uint64_t in_file_id_volatile)
+                                               struct files_struct *fsp)
 {
         struct tevent_req *req;
@@ -131 +121 @@
         NTSTATUS status;
         struct smb_request *smbreq;
-        files_struct *fsp;
 
         req = tevent_req_create(mem_ctx, &state,
@@ -140 +129 @@
         state->smb2req = smb2req;
 
-        DEBUG(10,("smbd_smb2_flush: file_id[0x%016llX]\n",
-                  (unsigned long long)in_file_id_volatile));
+        DEBUG(10,("smbd_smb2_flush: %s - fnum[%d]\n",
+                  fsp_str_dbg(fsp), fsp->fnum));
 
         smbreq = smbd_smb2_fake_smb_request(smb2req);
@@ -150 +139 @@
         if (IS_IPC(smbreq->conn)) {
                 tevent_req_nterror(req, NT_STATUS_NOT_IMPLEMENTED);
-                return tevent_req_post(req, ev);
-        }
-
-        fsp = file_fsp(smbreq, (uint16_t)in_file_id_volatile);
-        if (fsp == NULL) {
-                tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
-                return tevent_req_post(req, ev);
-        }
-        if (smbreq->conn != fsp->conn) {
-                tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
-                return tevent_req_post(req, ev);
-        }
-        if (smb2req->session->vuid != fsp->vuid) {
-                tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
                 return tevent_req_post(req, ev);
         }