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

trunk/server/source3/smbd/smb2_notify.c

@@ -37 +37 @@
                                                 struct tevent_context *ev,
                                                 struct smbd_smb2_request *smb2req,
+                                                struct files_struct *in_fsp,
                                                 uint16_t in_flags,
                                                 uint32_t in_output_buffer_length,
-                                                uint64_t in_file_id_volatile,
                                                 uint64_t in_completion_filter);
 static NTSTATUS smbd_smb2_notify_recv(struct tevent_req *req,
@@ -48 +48 @@
 NTSTATUS smbd_smb2_request_process_notify(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 = 0x20;
-        size_t body_size;
         uint16_t in_flags;
         uint32_t in_output_buffer_length;
         uint64_t in_file_id_persistent;
         uint64_t in_file_id_volatile;
+        struct files_struct *in_fsp;
         uint64_t in_completion_filter;
         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, 0x20);
+        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_flags                = SVAL(inbody, 0x02);
@@ -82 +75 @@
          * Windows 2008 uses 0x00080000
          */
-        if (in_output_buffer_length > lp_smb2_max_trans()) {
+        if (in_output_buffer_length > req->sconn->smb2.max_trans) {
                 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_notify_send(req,
-                                       req->sconn->smb2.event_ctx,
-                                       req,
+        subreq = smbd_smb2_notify_send(req, req->sconn->smb2.event_ctx,
+                                       req, in_fsp,
                                        in_flags,
                                        in_output_buffer_length,
-                                       in_file_id_volatile,
                                        in_completion_filter);
         if (subreq == NULL) {
@@ -194 +184 @@
                                                 struct tevent_context *ev,
                                                 struct smbd_smb2_request *smb2req,
+                                                struct files_struct *fsp,
                                                 uint16_t in_flags,
                                                 uint32_t in_output_buffer_length,
-                                                uint64_t in_file_id_volatile,
                                                 uint64_t in_completion_filter)
 {
@@ -203 +193 @@
         struct smb_request *smbreq;
         connection_struct *conn = smb2req->tcon->compat_conn;
-        files_struct *fsp;
         bool recursive = (in_flags & 0x0001) ? true : false;
         NTSTATUS status;
@@ -217 +206 @@
         state->im = NULL;
 
-        DEBUG(10,("smbd_smb2_notify_send: file_id[0x%016llX]\n",
-                  (unsigned long long)in_file_id_volatile));
+        DEBUG(10,("smbd_smb2_notify_send: %s - fnum[%d]\n",
+                  fsp_str_dbg(fsp), fsp->fnum));
 
         smbreq = smbd_smb2_fake_smb_request(smb2req);
@@ -227 +216 @@
         state->smbreq = smbreq;
         smbreq->async_priv = (void *)req;
-
-        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);
-        }
 
         {
@@ -383 +358 @@
                                                struct smbd_smb2_notify_state);
 
+        state->smb2req->cancelled = true;
         smbd_notify_cancel_by_smbreq(state->smbreq);
 
-        state->smb2req->cancelled = true;
-        tevent_req_done(req);
         return true;
 }