Changeset 751 for trunk/server/source3/smbd/smb2_read.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_read.c (modified) (13 diffs)

trunk/server/source3/smbd/smb2_read.c

@@ -31 +31 @@
                                               struct tevent_context *ev,
                                               struct smbd_smb2_request *smb2req,
+                                              struct files_struct *in_fsp,
                                               uint32_t in_smbpid,
-                                              uint64_t in_file_id_volatile,
                                               uint32_t in_length,
                                               uint64_t in_offset,
@@ -45 +45 @@
 NTSTATUS smbd_smb2_request_process_read(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;
         uint32_t in_length;
@@ -55 +54 @@
         uint64_t in_file_id_persistent;
         uint64_t in_file_id_volatile;
+        struct files_struct *in_fsp;
         uint32_t in_minimum_count;
         uint32_t in_remaining_bytes;
         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);
@@ -81 +76 @@
 
         /* check the max read size */
-        if (in_length > lp_smb2_max_read()) {
+        if (in_length > req->sconn->smb2.max_read) {
                 DEBUG(0,("here:%s: 0x%08X: 0x%08X\n",
-                        __location__, in_length, lp_smb2_max_read()));
+                        __location__, in_length, req->sconn->smb2.max_read));
                 return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
         }
 
-        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_read_send(req,
-                                     req->sconn->smb2.event_ctx,
-                                     req,
+        subreq = smbd_smb2_read_send(req, req->sconn->smb2.event_ctx,
+                                     req, in_fsp,
                                      in_smbpid,
-                                     in_file_id_volatile,
                                      in_length,
                                      in_offset,
@@ -177 +169 @@
         struct smbd_smb2_request *smb2req;
         files_struct *fsp;
-        uint64_t in_file_id_volatile;
         uint32_t in_length;
         uint64_t in_offset;
@@ -259 +250 @@
 
         init_strict_lock_struct(fsp,
-                                state->in_file_id_volatile,
+                                fsp->fnum,
                                 in_offset,
                                 in_length,
@@ -374 +365 @@
                                               struct tevent_context *ev,
                                               struct smbd_smb2_request *smb2req,
+                                              struct files_struct *fsp,
                                               uint32_t in_smbpid,
-                                              uint64_t in_file_id_volatile,
                                               uint32_t in_length,
                                               uint64_t in_offset,
@@ -386 +377 @@
         struct smb_request *smbreq = NULL;
         connection_struct *conn = smb2req->tcon->compat_conn;
-        files_struct *fsp = NULL;
         ssize_t nread = -1;
         struct lock_struct lock;
@@ -403 +393 @@
         state->out_remaining = 0;
 
-        DEBUG(10,("smbd_smb2_read: file_id[0x%016llX]\n",
-                  (unsigned long long)in_file_id_volatile));
+        DEBUG(10,("smbd_smb2_read: %s - fnum[%d]\n",
+                  fsp_str_dbg(fsp), fsp->fnum));
 
         smbreq = smbd_smb2_fake_smb_request(smb2req);
@@ -411 +401 @@
         }
 
-        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);
-        }
         if (fsp->is_directory) {
                 tevent_req_nterror(req, NT_STATUS_INVALID_DEVICE_REQUEST);
@@ -430 +407 @@
 
         state->fsp = fsp;
-        state->in_file_id_volatile = in_file_id_volatile;
 
         if (IS_IPC(smbreq->conn)) {
@@ -493 +469 @@
 
         init_strict_lock_struct(fsp,
-                                in_file_id_volatile,
+                                fsp->fnum,
                                 in_offset,
                                 in_length,
@@ -533 +509 @@
         SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
 
-        DEBUG(10,("smbd_smb2_read: file %s handle [0x%016llX] offset=%llu "
+        DEBUG(10,("smbd_smb2_read: file %s fnum[%d] offset=%llu "
                 "len=%llu returned %lld\n",
                 fsp_str_dbg(fsp),
-                (unsigned long long)in_file_id_volatile,
+                fsp->fnum,
                 (unsigned long long)in_offset,
                 (unsigned long long)in_length,