static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
- uint32_t in_smbpid,
- uint64_t in_file_id_volatile,
+ struct files_struct *in_fsp,
uint32_t in_length,
uint64_t in_offset,
uint32_t in_minimum,
NTSTATUS smbd_smb2_request_process_read(struct smbd_smb2_request *req)
{
NTSTATUS status;
- const uint8_t *inhdr;
const uint8_t *inbody;
- int i = req->current_idx;
- uint32_t in_smbpid;
uint32_t in_length;
uint64_t in_offset;
uint64_t in_file_id_persistent;
uint64_t in_file_id_volatile;
+ struct files_struct *in_fsp;
uint32_t in_minimum_count;
uint32_t in_remaining_bytes;
struct tevent_req *subreq;
if (!NT_STATUS_IS_OK(status)) {
return smbd_smb2_request_error(req, status);
}
- inhdr = (const uint8_t *)req->in.vector[i+0].iov_base;
- inbody = (const uint8_t *)req->in.vector[i+1].iov_base;
-
- in_smbpid = IVAL(inhdr, SMB2_HDR_PID);
+ inbody = SMBD_SMB2_IN_BODY_PTR(req);
in_length = IVAL(inbody, 0x04);
in_offset = BVAL(inbody, 0x08);
/* check the max read size */
if (in_length > req->sconn->smb2.max_read) {
- DEBUG(0,("here:%s: 0x%08X: 0x%08X\n",
+ DEBUG(2,("smbd_smb2_request_process_read: "
+ "client ignored max read: %s: 0x%08X: 0x%08X\n",
__location__, in_length, req->sconn->smb2.max_read));
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) {
+ status = smbd_smb2_request_verify_creditcharge(req, in_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_read_send(req,
- req->sconn->ev_ctx,
- req,
- in_smbpid,
- in_file_id_volatile,
+ subreq = smbd_smb2_read_send(req, req->sconn->ev_ctx,
+ req, in_fsp,
in_length,
in_offset,
in_minimum_count,
{
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;
uint8_t out_data_offset;
out_data_offset = SMB2_HDR_BODY + 0x10;
- outhdr = (uint8_t *)req->out.vector[i].iov_base;
-
outbody = data_blob_talloc(req->out.vector, NULL, 0x10);
if (outbody.data == NULL) {
error = smbd_smb2_request_error(req, NT_STATUS_NO_MEMORY);
struct smbd_smb2_request *smb2req;
struct smb_request *smbreq;
files_struct *fsp;
- uint64_t in_file_id_volatile;
uint32_t in_length;
uint64_t in_offset;
uint32_t in_minimum;
+ DATA_BLOB out_headers;
DATA_BLOB out_data;
uint32_t out_remaining;
};
ssize_t nread;
nread = SMB_VFS_SENDFILE(fsp->conn->sconn->sock,
- fsp,
- NULL,
- in_offset,
- in_length);
+ fsp,
+ state->smb2req->queue_entry.sendfile_header,
+ in_offset,
+ in_length);
DEBUG(10,("smb2_sendfile_send_data: SMB_VFS_SENDFILE returned %d on file %s\n",
(int)nread,
fsp_str_dbg(fsp) ));
}
init_strict_lock_struct(fsp,
- state->in_file_id_volatile,
+ fsp->op->global->open_persistent_id,
in_offset,
in_length,
READ_LOCK,
*/
if (!lp__use_sendfile(SNUM(fsp->conn)) ||
- smb2req->do_signing ||
- smb2req->in.vector_count != 4 ||
- (fsp->base_fsp != NULL) ||
- (fsp->wcp != NULL) ||
- (!S_ISREG(fsp->fsp_name->st.st_ex_mode)) ||
- (state->in_offset >= fsp->fsp_name->st.st_ex_size) ||
- (fsp->fsp_name->st.st_ex_size < state->in_offset +
- state->in_length)) {
+ smb2req->do_signing ||
+ smb2req->do_encryption ||
+ smb2req->in.vector_count >= (2*SMBD_SMB2_NUM_IOV_PER_REQ) ||
+ (fsp->base_fsp != NULL) ||
+ (fsp->wcp != NULL) ||
+ (!S_ISREG(fsp->fsp_name->st.st_ex_mode)) ||
+ (state->in_offset >= fsp->fsp_name->st.st_ex_size) ||
+ (fsp->fsp_name->st.st_ex_size < state->in_offset + state->in_length))
+ {
return NT_STATUS_RETRY;
}
}
*state_copy = *state;
talloc_set_destructor(state_copy, smb2_sendfile_send_data);
+ state->smb2req->queue_entry.sendfile_header = &state_copy->out_headers;
return NT_STATUS_OK;
}
return NT_STATUS_END_OF_FILE;
}
- DEBUG(3,("smbd_smb2_read: fnum=[%d/%s] length=%lu offset=%lu read=%lu\n",
- fsp->fnum,
+ DEBUG(3,("smbd_smb2_read: %s, file %s, length=%lu offset=%lu read=%lu\n",
+ fsp_fnum_dbg(fsp),
fsp_str_dbg(fsp),
(unsigned long)state->in_length,
(unsigned long)state->in_offset,
tevent_req_data(req,
struct smbd_smb2_read_state);
- state->smb2req->cancelled = true;
-
return cancel_smb2_aio(state->smbreq);
}
static struct tevent_req *smbd_smb2_read_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbd_smb2_request *smb2req,
- uint32_t in_smbpid,
- uint64_t in_file_id_volatile,
+ struct files_struct *fsp,
uint32_t in_length,
uint64_t in_offset,
uint32_t in_minimum,
struct tevent_req *req = NULL;
struct smbd_smb2_read_state *state = NULL;
struct smb_request *smbreq = NULL;
- connection_struct *conn = smb2req->tcon->compat_conn;
- files_struct *fsp = NULL;
+ connection_struct *conn = smb2req->tcon->compat;
ssize_t nread = -1;
struct lock_struct lock;
int saved_errno;
state->out_data = data_blob_null;
state->out_remaining = 0;
- DEBUG(10,("smbd_smb2_read: file_id[0x%016llX]\n",
- (unsigned long long)in_file_id_volatile));
+ DEBUG(10,("smbd_smb2_read: %s - %s\n",
+ fsp_str_dbg(fsp), fsp_fnum_dbg(fsp)));
smbreq = smbd_smb2_fake_smb_request(smb2req);
if (tevent_req_nomem(smbreq, req)) {
}
state->smbreq = smbreq;
- 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 (fsp->is_directory) {
tevent_req_nterror(req, NT_STATUS_INVALID_DEVICE_REQUEST);
return tevent_req_post(req, ev);
}
state->fsp = fsp;
- state->in_file_id_volatile = in_file_id_volatile;
if (IS_IPC(smbreq->conn)) {
struct tevent_req *subreq = NULL;
fsp,
state,
&state->out_data,
- (SMB_OFF_T)in_offset,
+ (off_t)in_offset,
(size_t)in_length);
if (NT_STATUS_IS_OK(status)) {
if (!NT_STATUS_EQUAL(status, NT_STATUS_RETRY)) {
/* Real error in setting up aio. Fail. */
- tevent_req_nterror(req, NT_STATUS_FILE_CLOSED);
+ tevent_req_nterror(req, status);
return tevent_req_post(req, ev);
}
/* Fallback to synchronous. */
init_strict_lock_struct(fsp,
- in_file_id_volatile,
+ fsp->op->global->open_persistent_id,
in_offset,
in_length,
READ_LOCK,
SMB_VFS_STRICT_UNLOCK(conn, fsp, &lock);
- DEBUG(10,("smbd_smb2_read: file %s handle [0x%016llX] offset=%llu "
+ DEBUG(10,("smbd_smb2_read: file %s, %s, offset=%llu "
"len=%llu returned %lld\n",
fsp_str_dbg(fsp),
- (unsigned long long)in_file_id_volatile,
+ fsp_fnum_dbg(fsp),
(unsigned long long)in_offset,
(unsigned long long)in_length,
(long long)nread));
status = np_read_recv(subreq, &nread, &is_data_outstanding);
TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
+ NTSTATUS old = status;
+ status = nt_status_np_pipe(old);
tevent_req_nterror(req, status);
return;
}
git.samba.org / samba.git / blobdiff