diff options
| author | Stefan Metzmacher <metze@samba.org> | 2022-07-25 22:28:27 +0200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2022-07-26 13:40:34 +0000 |
| commit | 98269bd5f31a2521b756e0a20fba82e9122582f7 (patch) | |
| tree | 67316af724357a1d3a5e7a278e8977e95c83b1e6 | |
| parent | 67af3586d989be9d6a8fe7e7789250451b03f2bb (diff) | |
| download | samba-98269bd5f31a2521b756e0a20fba82e9122582f7.tar.gz | |
s3:smbXsrv_session: introduce smb2srv_session_close_previous_cleanup()
This makes sure we cleanup the locked record in all cases.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15125
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
| -rw-r--r-- | source3/smbd/smbXsrv_session.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/source3/smbd/smbXsrv_session.c b/source3/smbd/smbXsrv_session.c index e5a3065ff00..05b382ce506 100644 --- a/source3/smbd/smbXsrv_session.c +++ b/source3/smbd/smbXsrv_session.c @@ -983,6 +983,16 @@ struct smb2srv_session_close_previous_state { struct db_record *db_rec; }; +static void smb2srv_session_close_previous_cleanup(struct tevent_req *req, + enum tevent_req_state req_state) +{ + struct smb2srv_session_close_previous_state *state = + tevent_req_data(req, + struct smb2srv_session_close_previous_state); + + TALLOC_FREE(state->db_rec); +} + static void smb2srv_session_close_previous_check(struct tevent_req *req); static void smb2srv_session_close_previous_modified(struct tevent_req *subreq); @@ -1010,6 +1020,8 @@ struct tevent_req *smb2srv_session_close_previous_send(TALLOC_CTX *mem_ctx, state->previous_session_id = previous_session_id; state->current_session_id = current_session_id; + tevent_req_set_cleanup_fn(req, smb2srv_session_close_previous_cleanup); + if (global_zeros != 0) { tevent_req_done(req); return tevent_req_post(req, ev); @@ -1076,13 +1088,11 @@ static void smb2srv_session_close_previous_check(struct tevent_req *req) &global); if (is_free) { - TALLOC_FREE(state->db_rec); tevent_req_done(req); return; } if (global->auth_session_info == NULL) { - TALLOC_FREE(state->db_rec); tevent_req_done(req); return; } @@ -1090,7 +1100,6 @@ static void smb2srv_session_close_previous_check(struct tevent_req *req) previous_token = global->auth_session_info->security_token; if (!security_token_is_sid(previous_token, state->current_sid)) { - TALLOC_FREE(state->db_rec); tevent_req_done(req); return; } @@ -1099,7 +1108,6 @@ static void smb2srv_session_close_previous_check(struct tevent_req *req) 0, /* resume_instance */ (struct server_id){0}); if (tevent_req_nomem(subreq, req)) { - TALLOC_FREE(state->db_rec); return; } tevent_req_set_callback(subreq, @@ -1118,7 +1126,6 @@ static void smb2srv_session_close_previous_check(struct tevent_req *req) ndr_err = ndr_push_struct_blob(&blob, state, &close_blob, (ndr_push_flags_fn_t)ndr_push_smbXsrv_session_closeB); if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) { - TALLOC_FREE(state->db_rec); status = ndr_map_error2ntstatus(ndr_err); DEBUG(1,("smb2srv_session_close_previous_check: " "old_session[%llu] new_session[%llu] ndr_push - %s\n", @@ -1132,12 +1139,12 @@ static void smb2srv_session_close_previous_check(struct tevent_req *req) status = messaging_send(conn->client->msg_ctx, global->channels[0].server_id, MSG_SMBXSRV_SESSION_CLOSE, &blob); - TALLOC_FREE(state->db_rec); + TALLOC_FREE(global); if (tevent_req_nterror(req, status)) { return; } - TALLOC_FREE(global); + TALLOC_FREE(state->db_rec); return; } |