sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-11 08:23:49 +03:00
Code Activity

r8023: use a pointer to a DATA_BLOB for each reply,

Browse Source 
that will allow the write_fn callback of dcesrv_output()
to reference the memory with a valid TALLOC pointer

metze
This commit is contained in:
Stefan Metzmacher
2005-06-30 19:24:29 +00:00
committed by Gerald (Jerry) Carter
parent fe483dcd87
commit d0574d407f
2 changed files with 40 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
source/rpc_server/dcerpc_server.c
View File

@@ -399,16 +399,15 @@ static NTSTATUS dcesrv_fault(struct dcesrv_call_state *call, uint32_t fault_code
pkt.u.fault.status = fault_code; pkt.u.fault.status = fault_code;
rep = talloc(call, struct dcesrv_call_reply); rep = talloc(call, struct dcesrv_call_reply);
if (!rep) { NT_STATUS_HAVE_NO_MEMORY(rep);
return NT_STATUS_NO_MEMORY;
}
status = ncacn_push_auth(&rep->data, call, &pkt, NULL); rep->data = talloc(call, DATA_BLOB);
if (!NT_STATUS_IS_OK(status)) { NT_STATUS_HAVE_NO_MEMORY(rep->data);
return status;
}
dcerpc_set_frag_length(&rep->data, rep->data.length); status = ncacn_push_auth(rep->data, call, &pkt, NULL);
NT_STATUS_NOT_OK_RETURN(status);
dcerpc_set_frag_length(rep->data, rep->data->length);
DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *); DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *); DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
@@ -436,16 +435,15 @@ static NTSTATUS dcesrv_bind_nak(struct dcesrv_call_state *call, uint32_t reason)
pkt.u.bind_nak.num_versions = 0; pkt.u.bind_nak.num_versions = 0;
rep = talloc(call, struct dcesrv_call_reply); rep = talloc(call, struct dcesrv_call_reply);
if (!rep) { NT_STATUS_HAVE_NO_MEMORY(rep);
return NT_STATUS_NO_MEMORY;
}
status = ncacn_push_auth(&rep->data, call, &pkt, NULL); rep->data = talloc(call, DATA_BLOB);
if (!NT_STATUS_IS_OK(status)) { NT_STATUS_HAVE_NO_MEMORY(rep->data);
return status;
}
dcerpc_set_frag_length(&rep->data, rep->data.length); status = ncacn_push_auth(rep->data, call, &pkt, NULL);
NT_STATUS_NOT_OK_RETURN(status);
dcerpc_set_frag_length(rep->data, rep->data->length);
DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *); DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *); DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
@@ -571,17 +569,16 @@ static NTSTATUS dcesrv_bind(struct dcesrv_call_state *call)
} }
rep = talloc(call, struct dcesrv_call_reply); rep = talloc(call, struct dcesrv_call_reply);
if (!rep) { NT_STATUS_HAVE_NO_MEMORY(rep);
return NT_STATUS_NO_MEMORY;
}
status = ncacn_push_auth(&rep->data, call, &pkt, rep->data = talloc(call, DATA_BLOB);
call->conn->auth_state.auth_info); NT_STATUS_HAVE_NO_MEMORY(rep->data);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
dcerpc_set_frag_length(&rep->data, rep->data.length); status = ncacn_push_auth(rep->data, call, &pkt,
call->conn->auth_state.auth_info);
NT_STATUS_NOT_OK_RETURN(status);
dcerpc_set_frag_length(rep->data, rep->data->length);
DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *); DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *); DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
@@ -713,17 +710,16 @@ static NTSTATUS dcesrv_alter(struct dcesrv_call_state *call)
} }
rep = talloc(call, struct dcesrv_call_reply); rep = talloc(call, struct dcesrv_call_reply);
if (!rep) { NT_STATUS_HAVE_NO_MEMORY(rep);
return NT_STATUS_NO_MEMORY;
}
status = ncacn_push_auth(&rep->data, call, &pkt, rep->data = talloc(call, DATA_BLOB);
call->conn->auth_state.auth_info); NT_STATUS_HAVE_NO_MEMORY(rep->data);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
dcerpc_set_frag_length(&rep->data, rep->data.length); status = ncacn_push_auth(rep->data, call, &pkt,
call->conn->auth_state.auth_info);
NT_STATUS_IS_OK_RETURN(status);
dcerpc_set_frag_length(rep->data, rep->data->length);
DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *); DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *); DLIST_ADD_END(call->conn->call_list, call, struct dcesrv_call_state *);
@@ -844,6 +840,9 @@ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call)
rep = talloc(call, struct dcesrv_call_reply); rep = talloc(call, struct dcesrv_call_reply);
NT_STATUS_HAVE_NO_MEMORY(rep); NT_STATUS_HAVE_NO_MEMORY(rep);
rep->data = talloc(call, DATA_BLOB);
NT_STATUS_HAVE_NO_MEMORY(rep->data);
length = stub.length; length = stub.length;
if (length + DCERPC_RESPONSE_LENGTH > call->conn->cli_max_recv_frag) { if (length + DCERPC_RESPONSE_LENGTH > call->conn->cli_max_recv_frag) {
/* the 32 is to cope with signing data */ /* the 32 is to cope with signing data */
@@ -869,11 +868,11 @@ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call)
pkt.u.response.stub_and_verifier.data = stub.data; pkt.u.response.stub_and_verifier.data = stub.data;
pkt.u.response.stub_and_verifier.length = length; pkt.u.response.stub_and_verifier.length = length;
if (!dcesrv_auth_response(call, &rep->data, &pkt)) { if (!dcesrv_auth_response(call, rep->data, &pkt)) {
return dcesrv_fault(call, DCERPC_FAULT_OTHER); return dcesrv_fault(call, DCERPC_FAULT_OTHER);
} }
dcerpc_set_frag_length(&rep->data, rep->data.length); dcerpc_set_frag_length(rep->data, rep->data->length);
DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *); DLIST_ADD_END(call->replies, rep, struct dcesrv_call_reply *);
@@ -1127,13 +1126,13 @@ NTSTATUS dcesrv_output(struct dcesrv_connection *dce_conn,
} }
rep = call->replies; rep = call->replies;
status = write_fn(private_data, &rep->data, &nwritten); status = write_fn(private_data, rep->data, &nwritten);
NT_STATUS_IS_ERR_RETURN(status); NT_STATUS_IS_ERR_RETURN(status);
rep->data.length -= nwritten; rep->data->length -= nwritten;
rep->data.data += nwritten; rep->data->data += nwritten;
if (rep->data.length == 0) { if (rep->data->length == 0) {
/* we're done with this section of the call */ /* we're done with this section of the call */
DLIST_REMOVE(call->replies, rep); DLIST_REMOVE(call->replies, rep);
} }

2
source/rpc_server/dcerpc_server.h
View File

@@ -104,7 +104,7 @@ struct dcesrv_call_state {
struct dcesrv_call_reply { struct dcesrv_call_reply {
struct dcesrv_call_reply *next, *prev; struct dcesrv_call_reply *next, *prev;
DATA_BLOB data; DATA_BLOB *data;
} *replies; } *replies;
/* this is used by the boilerplate code to generate DCERPC faults */ /* this is used by the boilerplate code to generate DCERPC faults */