Changeset 751 for trunk/server/source3/smbd/smb2_write.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_write.c (modified) (11 diffs)

trunk/server/source3/smbd/smb2_write.c

@@ -29 +29 @@
                                                struct tevent_context *ev,
                                                struct smbd_smb2_request *smb2req,
+                                               struct files_struct *in_fsp,
                                                uint32_t in_smbpid,
-                                               uint64_t in_file_id_volatile,
                                                DATA_BLOB in_data,
                                                uint64_t in_offset,
@@ -40 +40 @@
 NTSTATUS smbd_smb2_request_process_write(struct smbd_smb2_request *req)
 {
+        NTSTATUS status;
         const uint8_t *inhdr;
         const uint8_t *inbody;
         int i = req->current_idx;
-        size_t expected_body_size = 0x31;
-        size_t body_size;
         uint32_t in_smbpid;
         uint16_t in_data_offset;
@@ -52 +51 @@
         uint64_t in_file_id_persistent;
         uint64_t in_file_id_volatile;
+        struct files_struct *in_fsp;
         uint32_t in_flags;
         struct tevent_req *subreq;
 
+        status = smbd_smb2_request_verify_sizes(req, 0x31);
+        if (!NT_STATUS_IS_OK(status)) {
+                return smbd_smb2_request_error(req, status);
+        }
         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);
-        }
-
         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_smbpid = IVAL(inhdr, SMB2_HDR_PID);
@@ -76 +71 @@
         in_flags                = IVAL(inbody, 0x2C);
 
-        if (in_data_offset != (SMB2_HDR_BODY + (body_size & 0xFFFFFFFE))) {
+        if (in_data_offset != (SMB2_HDR_BODY + req->in.vector[i+1].iov_len)) {
                 return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
         }
@@ -85 +80 @@
 
         /* check the max write size */
-        if (in_data_length > lp_smb2_max_write()) {
-                /* This is a warning. */
+        if (in_data_length > req->sconn->smb2.max_write) {
                 DEBUG(2,("smbd_smb2_request_process_write : "
                         "client ignored max write :%s: 0x%08X: 0x%08X\n",
-                        __location__, in_data_length, lp_smb2_max_write()));
-#if 0
+                        __location__, in_data_length, req->sconn->smb2.max_write));
                 return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
-#endif
         }
 
@@ -98 +90 @@
         in_data_buffer.length = in_data_length;
 
-        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_write_send(req,
-                                      req->sconn->smb2.event_ctx,
-                                      req,
+        subreq = smbd_smb2_write_send(req, req->sconn->smb2.event_ctx,
+                                      req, in_fsp,
                                       in_smbpid,
-                                      in_file_id_volatile,
                                       in_data_buffer,
                                       in_offset,
@@ -225 +214 @@
                                                struct tevent_context *ev,
                                                struct smbd_smb2_request *smb2req,
+                                               struct files_struct *fsp,
                                                uint32_t in_smbpid,
-                                               uint64_t in_file_id_volatile,
                                                DATA_BLOB in_data,
                                                uint64_t in_offset,
@@ -236 +225 @@
         struct smb_request *smbreq = NULL;
         connection_struct *conn = smb2req->tcon->compat_conn;
-        files_struct *fsp = NULL;
         ssize_t nwritten;
         struct lock_struct lock;
@@ -252 +240 @@
         state->out_count = 0;
 
-        DEBUG(10,("smbd_smb2_write: file_id[0x%016llX]\n",
-                  (unsigned long long)in_file_id_volatile));
+        DEBUG(10,("smbd_smb2_write: %s - fnum[%d]\n",
+                  fsp_str_dbg(fsp), fsp->fnum));
 
         smbreq = smbd_smb2_fake_smb_request(smb2req);
         if (tevent_req_nomem(smbreq, req)) {
-                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 (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);
         }
@@ -325 +299 @@
         if (!NT_STATUS_EQUAL(status, NT_STATUS_RETRY)) {
                 /* Real error in setting up aio. Fail. */
-                tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
+                tevent_req_nterror(req, status);
                 return tevent_req_post(req, ev);
         }
@@ -331 +305 @@
         /* Fallback to synchronous. */
         init_strict_lock_struct(fsp,
-                                in_file_id_volatile,
+                                fsp->fnum,
                                 in_offset,
                                 in_data.length,