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

trunk/server/source3/smbd/smb2_setinfo.c

@@ -30 +30 @@
                                                  struct tevent_context *ev,
                                                  struct smbd_smb2_request *smb2req,
+                                                 struct files_struct *in_fsp,
                                                  uint8_t in_info_type,
                                                  uint8_t in_file_info_class,
                                                  DATA_BLOB in_input_buffer,
-                                                 uint32_t in_additional_information,
-                                                 uint64_t in_file_id_volatile);
+                                                 uint32_t in_additional_information);
 static NTSTATUS smbd_smb2_setinfo_recv(struct tevent_req *req);
 
@@ -40 +40 @@
 NTSTATUS smbd_smb2_request_process_setinfo(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 = 0x21;
-        size_t body_size;
         uint8_t in_info_type;
         uint8_t in_file_info_class;
@@ -53 +51 @@
         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, 0x21);
+        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_info_type                    = CVAL(inbody, 0x02);
@@ -79 +72 @@
                 /* This is ok */
         } else if (in_input_buffer_offset !=
-                   (SMB2_HDR_BODY + (body_size & 0xFFFFFFFE))) {
+                   (SMB2_HDR_BODY + req->in.vector[i+1].iov_len)) {
                 return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
         }
@@ -90 +83 @@
         in_input_buffer.length = in_input_buffer_length;
 
-        if (req->compat_chain_fsp) {
-                /* skip check */
-        } else if (in_file_id_persistent != in_file_id_volatile) {
+        if (in_input_buffer.length > req->sconn->smb2.max_trans) {
+                return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+        }
+
+        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_setinfo_send(req,
-                                        req->sconn->smb2.event_ctx,
-                                        req,
+        subreq = smbd_smb2_setinfo_send(req, req->sconn->smb2.event_ctx,
+                                        req, in_fsp,
                                         in_info_type,
                                         in_file_info_class,
                                         in_input_buffer,
-                                        in_additional_information,
-                                        in_file_id_volatile);
+                                        in_additional_information);
         if (subreq == NULL) {
                 return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
@@ -160 +154 @@
                                                  struct tevent_context *ev,
                                                  struct smbd_smb2_request *smb2req,
+                                                 struct files_struct *fsp,
                                                  uint8_t in_info_type,
                                                  uint8_t in_file_info_class,
                                                  DATA_BLOB in_input_buffer,
-                                                 uint32_t in_additional_information,
-                                                 uint64_t in_file_id_volatile)
+                                                 uint32_t in_additional_information)
 {
         struct tevent_req *req = NULL;
@@ -170 +164 @@
         struct smb_request *smbreq = NULL;
         connection_struct *conn = smb2req->tcon->compat_conn;
-        files_struct *fsp = NULL;
         NTSTATUS status;
 
@@ -180 +173 @@
         state->smb2req = smb2req;
 
-        DEBUG(10,("smbd_smb2_setinfo_send: file_id[0x%016llX]\n",
-                  (unsigned long long)in_file_id_volatile));
+        DEBUG(10,("smbd_smb2_setinfo_send: %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);
         }
@@ -220 +199 @@
                         /* SMB2_FILE_RENAME_INFORMATION_INTERNAL == 0xFF00 + in_file_info_class */
                         file_info_level = SMB2_FILE_RENAME_INFORMATION_INTERNAL;
-                        if (fsp->oplock_type != FAKE_LEVEL_II_OPLOCK &&
-                            fsp->oplock_type != NO_OPLOCK) {
-                                /* No break, but error. */
-                                tevent_req_nterror(req, NT_STATUS_SHARING_VIOLATION);
-                                return tevent_req_post(req, ev);
-                        }
                 }
 
@@ -326 +299 @@
                 }
 
-                status = set_sd(fsp,
+                status = set_sd_blob(fsp,
                                 in_input_buffer.data,
                                 in_input_buffer.length,