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

trunk/server/source3/smbd/smb2_break.c

@@ -29 +29 @@
                                                       struct tevent_context *ev,
                                                       struct smbd_smb2_request *smb2req,
-                                                      uint8_t in_oplock_level,
-                                                      uint64_t in_file_id_volatile);
+                                                      struct files_struct *in_fsp,
+                                                      uint8_t in_oplock_level);
 static NTSTATUS smbd_smb2_oplock_break_recv(struct tevent_req *req,
                                             uint8_t *out_oplock_level);
@@ -37 +37 @@
 NTSTATUS smbd_smb2_request_process_break(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;
         uint8_t in_oplock_level;
         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_oplock_level         = CVAL(inbody, 0x02);
@@ -71 +64 @@
         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_oplock_break_send(req,
-                                             req->sconn->smb2.event_ctx,
-                                             req,
-                                             in_oplock_level,
-                                             in_file_id_volatile);
+        subreq = smbd_smb2_oplock_break_send(req, req->sconn->smb2.event_ctx,
+                                             req, in_fsp, in_oplock_level);
         if (subreq == NULL) {
                 return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
@@ -157 +146 @@
                                                       struct tevent_context *ev,
                                                       struct smbd_smb2_request *smb2req,
-                                                      uint8_t in_oplock_level,
-                                                      uint64_t in_file_id_volatile)
+                                                      struct files_struct *fsp,
+                                                      uint8_t in_oplock_level)
 {
         struct tevent_req *req;
         struct smbd_smb2_oplock_break_state *state;
         struct smb_request *smbreq;
-        connection_struct *conn = smb2req->tcon->compat_conn;
-        files_struct *fsp = NULL;
         int oplocklevel = map_smb2_oplock_levels_to_samba(in_oplock_level);
         bool break_to_none = (oplocklevel == NO_OPLOCK);
@@ -177 +164 @@
         state->out_oplock_level = SMB2_OPLOCK_LEVEL_NONE;
 
-        DEBUG(10,("smbd_smb2_oplock_break_send: file_id[0x%016llX] "
-                "samba level %d\n",
-                (unsigned long long)in_file_id_volatile,
-                oplocklevel));
+        DEBUG(10,("smbd_smb2_oplock_break_send: %s - fnum[%d] "
+                  "samba level %d\n",
+                  fsp_str_dbg(fsp), fsp->fnum,
+                  oplocklevel));
 
         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);
         }
@@ -265 +238 @@
                                 SMB2_OPLOCK_LEVEL_NONE;
         NTSTATUS status;
+        uint64_t fsp_persistent = fsp_persistent_id(fsp);
 
         DEBUG(10,("send_break_message_smb2: sending oplock break "
@@ -273 +247 @@
 
         status = smbd_smb2_send_oplock_break(fsp->conn->sconn,
-                                        (uint64_t)fsp->fnum,
+                                        fsp_persistent,
                                         (uint64_t)fsp->fnum,
                                         smb2_oplock_level);