s3:smbd: change smb2_getinfo.c to use fsp_fnum_dbg() for fsp->fnum logging.

[ambi/samba-autobuild/.git] / source3 / smbd / smb2_getinfo.c

diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 61e0cfa06c387bb45aca9acb681b3fe38b605355..10b093737fa89c1cee62f598404b28e955f6f6eb 100644 (file)
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -29,13 +29,13 @@
 static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                                                 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,
                                                 uint32_t in_output_buffer_length,
                                                 DATA_BLOB in_input_buffer,
                                                 uint32_t in_additional_information,
-                                                uint32_t in_flags,
-                                                uint64_t in_file_id_volatile);
+                                                uint32_t in_flags);
 static NTSTATUS smbd_smb2_getinfo_recv(struct tevent_req *req,
                                       TALLOC_CTX *mem_ctx,
                                       DATA_BLOB *out_output_buffer,
@@ -57,6 +57,7 @@ NTSTATUS smbd_smb2_request_process_getinfo(struct smbd_smb2_request *req)
        uint32_t in_flags;
        uint64_t in_file_id_persistent;
        uint64_t in_file_id_volatile;
+       struct files_struct *in_fsp;
        struct tevent_req *subreq;
 
        status = smbd_smb2_request_verify_sizes(req, 0x29);
@@ -90,36 +91,52 @@ NTSTATUS smbd_smb2_request_process_getinfo(struct smbd_smb2_request *req)
        in_input_buffer.data = (uint8_t *)req->in.vector[i+2].iov_base;
        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) {
+               DEBUG(2,("smbd_smb2_request_process_getinfo: "
+                        "client ignored max trans: %s: 0x%08X: 0x%08X\n",
+                        __location__, (unsigned)in_input_buffer.length,
+                        (unsigned)req->sconn->smb2.max_trans));
+               return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+       }
+       if (in_output_buffer_length > req->sconn->smb2.max_trans) {
+               DEBUG(2,("smbd_smb2_request_process_getinfo: "
+                        "client ignored max trans: %s: 0x%08X: 0x%08X\n",
+                        __location__, in_output_buffer_length,
+                        req->sconn->smb2.max_trans));
+               return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+       }
+
+       status = smbd_smb2_request_verify_creditcharge(req,
+                       MAX(in_input_buffer.length,in_output_buffer_length));
+       if (!NT_STATUS_IS_OK(status)) {
+               return smbd_smb2_request_error(req, status);
+       }
+
+       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_getinfo_send(req,
-                                       req->sconn->smb2.event_ctx,
-                                       req,
+       subreq = smbd_smb2_getinfo_send(req, req->sconn->ev_ctx,
+                                       req, in_fsp,
                                        in_info_type,
                                        in_file_info_class,
                                        in_output_buffer_length,
                                        in_input_buffer,
                                        in_additional_information,
-                                       in_flags,
-                                       in_file_id_volatile);
+                                       in_flags);
        if (subreq == NULL) {
                return smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
        }
        tevent_req_set_callback(subreq, smbd_smb2_request_getinfo_done, req);
 
-       return smbd_smb2_request_pending_queue(req, subreq);
+       return smbd_smb2_request_pending_queue(req, subreq, 500);
 }
 
 static void smbd_smb2_request_getinfo_done(struct tevent_req *subreq)
 {
        struct smbd_smb2_request *req = tevent_req_callback_data(subreq,
                                        struct smbd_smb2_request);
-       int i = req->current_idx;
-       uint8_t *outhdr;
        DATA_BLOB outbody;
        DATA_BLOB outdyn;
        uint16_t out_output_buffer_offset;
@@ -159,8 +176,6 @@ static void smbd_smb2_request_getinfo_done(struct tevent_req *subreq)
 
        out_output_buffer_offset = SMB2_HDR_BODY + 0x08;
 
-       outhdr = (uint8_t *)req->out.vector[i].iov_base;
-
        outbody = data_blob_talloc(req->out.vector, NULL, 0x08);
        if (outbody.data == NULL) {
                error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
@@ -227,19 +242,18 @@ static void smb2_ipc_getinfo(struct tevent_req *req,
 static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
                                                 struct tevent_context *ev,
                                                 struct smbd_smb2_request *smb2req,
+                                                struct files_struct *fsp,
                                                 uint8_t in_info_type,
                                                 uint8_t in_file_info_class,
                                                 uint32_t in_output_buffer_length,
                                                 DATA_BLOB in_input_buffer,
                                                 uint32_t in_additional_information,
-                                                uint32_t in_flags,
-                                                uint64_t in_file_id_volatile)
+                                                uint32_t in_flags)
 {
        struct tevent_req *req;
        struct smbd_smb2_getinfo_state *state;
        struct smb_request *smbreq;
        connection_struct *conn = smb2req->tcon->compat_conn;
-       files_struct *fsp;
        NTSTATUS status;
 
        req = tevent_req_create(mem_ctx, &state,
@@ -251,28 +265,14 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
        state->status = NT_STATUS_OK;
        state->out_output_buffer = data_blob_null;
 
-       DEBUG(10,("smbd_smb2_getinfo_send: file_id[0x%016llX]\n",
-                 (unsigned long long)in_file_id_volatile));
+       DEBUG(10,("smbd_smb2_getinfo_send: %s - %s\n",
+                 fsp_str_dbg(fsp), fsp_fnum_dbg(fsp)));
 
        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);
-       }
-
        if (IS_IPC(conn)) {
                smb2_ipc_getinfo(req, state, ev,
                        in_info_type, in_file_info_class);
@@ -316,7 +316,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
 
                        /* We know this name is ok, it's already passed the checks. */
 
-               } else if (fsp && fsp->fh->fd == -1) {
+               } else if (fsp->fh->fd == -1) {
                        /*
                         * This is actually a QFILEINFO on a directory
                         * handle (returned from an NT SMB). NT5.0 seems
@@ -355,8 +355,8 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
 
                        if (SMB_VFS_FSTAT(fsp, &fsp->fsp_name->st) != 0) {
                                DEBUG(3, ("smbd_smb2_getinfo_send: "
-                                         "fstat of fnum %d failed (%s)\n",
-                                         fsp->fnum, strerror(errno)));
+                                         "fstat of %s failed (%s)\n",
+                                         fsp_fnum_dbg(fsp), strerror(errno)));
                                status = map_nt_error_from_unix(errno);
                                tevent_req_nterror(req, status);
                                return tevent_req_post(req, ev);