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

trunk/server/source3/smbd/smb2_lock.c

@@ -47 +47 @@
                                                  struct tevent_context *ev,
                                                  struct smbd_smb2_request *smb2req,
+                                                 struct files_struct *in_fsp,
                                                  uint32_t in_smbpid,
-                                                 uint64_t in_file_id_volatile,
                                                  uint16_t in_lock_count,
                                                  struct smbd_smb2_lock_element *in_locks);
@@ -59 +59 @@
         const uint8_t *inbody;
         const int i = req->current_idx;
-        size_t expected_body_size = 0x30;
-        size_t body_size;
         uint32_t in_smbpid;
         uint16_t in_lock_count;
         uint64_t in_file_id_persistent;
         uint64_t in_file_id_volatile;
+        struct files_struct *in_fsp;
         struct smbd_smb2_lock_element *in_locks;
         struct tevent_req *subreq;
         const uint8_t *lock_buffer;
         uint16_t l;
-
+        NTSTATUS status;
+
+        status = smbd_smb2_request_verify_sizes(req, 0x30);
+        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);
@@ -95 +90 @@
         if (((in_lock_count - 1) * 0x18) > req->in.vector[i+2].iov_len) {
                 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) {
-                return smbd_smb2_request_error(req, NT_STATUS_FILE_CLOSED);
         }
 
@@ -128 +117 @@
         }
 
-        subreq = smbd_smb2_lock_send(req,
-                                     req->sconn->smb2.event_ctx,
-                                     req,
+        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_lock_send(req, req->sconn->smb2.event_ctx,
+                                     req, in_fsp,
                                      in_smbpid,
-                                     in_file_id_volatile,
                                      in_lock_count,
                                      in_locks);
@@ -214 +206 @@
                                                  struct tevent_context *ev,
                                                  struct smbd_smb2_request *smb2req,
+                                                 struct files_struct *fsp,
                                                  uint32_t in_smbpid,
-                                                 uint64_t in_file_id_volatile,
                                                  uint16_t in_lock_count,
                                                  struct smbd_smb2_lock_element *in_locks)
@@ -222 +214 @@
         struct smbd_smb2_lock_state *state;
         struct smb_request *smb1req;
-        connection_struct *conn = smb2req->tcon->compat_conn;
-        files_struct *fsp;
         int32_t timeout = -1;
         bool isunlock = false;
@@ -245 +235 @@
         state->smb1req = smb1req;
 
-        DEBUG(10,("smbd_smb2_lock_send: file_id[0x%016llX]\n",
-                  (unsigned long long)in_file_id_volatile));
-
-        fsp = file_fsp(smb1req, (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);
-        }
+        DEBUG(10,("smbd_smb2_lock_send: %s - fnum[%d]\n",
+                  fsp_str_dbg(fsp), fsp->fnum));
 
         locks = talloc_array(state, struct smbd_lock_element, in_lock_count);
@@ -342 +318 @@
                 }
 
-                locks[i].smblctx = in_file_id_volatile;
+                locks[i].smblctx = fsp->fnum;
                 locks[i].offset = in_locks[i].offset;
                 locks[i].count  = in_locks[i].length;
@@ -873 +849 @@
                 files_struct *fsp_curr = NULL;
                 int i = smb2req->current_idx;
-                uint64_t in_file_id_volatile;
                 struct blocking_lock_record *blr = NULL;
                 const uint8_t *inhdr;
-                const uint8_t *inbody;
 
                 nextreq = smb2req->next;
@@ -894 +868 @@
                         continue;
                 }
-
-                inbody = (const uint8_t *)smb2req->in.vector[i+1].iov_base;
-                in_file_id_volatile = BVAL(inbody, 0x10);
 
                 state = tevent_req_data(smb2req->subreq,
@@ -905 +876 @@
                 }
 
-                fsp_curr = file_fsp(state->smb1req, (uint16_t)in_file_id_volatile);
+                fsp_curr = smb2req->compat_chain_fsp;
                 if (fsp_curr == NULL) {
                         /* Strange - is this even possible ? */