sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

auth/gensec: make sure there's only one pending gensec_update_send() per context

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2017-05-11 13:28:10 +02:00 committed by Andrew Bartlett
parent 8a3a1111ed
commit 4f597f1e5e
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
auth/gensec/gensec.c
View File

@ -403,6 +403,8 @@ struct gensec_update_state {
DATA_BLOB out;
};
static void gensec_update_cleanup(struct tevent_req *req,
enum tevent_req_state req_state);
static void gensec_update_done(struct tevent_req *subreq);
/**
@ -430,15 +432,22 @@ _PUBLIC_ struct tevent_req *gensec_update_send(TALLOC_CTX *mem_ctx,
if (req == NULL) {
return NULL;
}
state->ops = gensec_security->ops;
state->gensec_security = gensec_security;
if (gensec_security->update_busy_ptr != NULL) {
tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
return tevent_req_post(req, ev);
}
if (gensec_security->child_security != NULL) {
tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
return tevent_req_post(req, ev);
}
gensec_security->update_busy_ptr = &state->gensec_security;
tevent_req_set_cleanup_fn(req, gensec_update_cleanup);
subreq = state->ops->update_send(state, ev, gensec_security, in);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
@ -448,6 +457,24 @@ _PUBLIC_ struct tevent_req *gensec_update_send(TALLOC_CTX *mem_ctx,
return req;
}
static void gensec_update_cleanup(struct tevent_req *req,
enum tevent_req_state req_state)
{
struct gensec_update_state *state =
tevent_req_data(req,
struct gensec_update_state);
if (state->gensec_security == NULL) {
return;
}
if (state->gensec_security->update_busy_ptr == &state->gensec_security) {
state->gensec_security->update_busy_ptr = NULL;
}
state->gensec_security = NULL;
}
static void gensec_update_done(struct tevent_req *subreq)
{
struct tevent_req *req =

6
auth/gensec/gensec_internal.h
View File

@ -113,6 +113,12 @@ struct gensec_security {
struct gensec_security *parent_security;
struct gensec_security *child_security;
/*
* This is used to mark the context as being
* busy in an async gensec_update_send().
*/
struct gensec_security **update_busy_ptr;
};
/* this structure is used by backends to determine the size of some critical types */