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

s3:lib/tls: we need to call tstream_tls_retry_handshake/disconnect() until all buffers are flushed

Browse Source 
Before the handshare or disconnect is over we need to wait until
we delivered the lowlevel messages to the transport/kernel socket.

Otherwise we'll have a problem if another tevent_context is used
after the handshake.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15621

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Stefan Metzmacher 2024-01-26 14:42:40 +01:00 committed by Andrew Bartlett
parent 5844ef27aa
commit 6688945fa0
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source4/lib/tls/tls_tstream.c
View File

@ -70,6 +70,10 @@ struct tstream_tls {
struct tevent_immediate *retry_im;
struct {
struct tevent_req *mgmt_req;
} waiting_flush;
struct {
uint8_t *buf;
off_t ofs;
@ -121,6 +125,17 @@ static void tstream_tls_retry(struct tstream_context *stream, bool deferred)
tstream_context_data(stream,
struct tstream_tls);
if (tlss->push.subreq == NULL && tlss->pull.subreq == NULL) {
if (tlss->waiting_flush.mgmt_req != NULL) {
struct tevent_req *req = tlss->waiting_flush.mgmt_req;
tlss->waiting_flush.mgmt_req = NULL;
tevent_req_done(req);
return;
}
}
if (tlss->disconnect.req) {
tstream_tls_retry_disconnect(stream);
return;
@ -785,6 +800,11 @@ static void tstream_tls_retry_disconnect(struct tstream_context *stream)
return;
}
if (tlss->push.subreq != NULL || tlss->pull.subreq != NULL) {
tlss->waiting_flush.mgmt_req = req;
return;
}
tevent_req_done(req);
}
@ -1477,6 +1497,11 @@ static void tstream_tls_retry_handshake(struct tstream_context *stream)
}
}
if (tlss->push.subreq != NULL || tlss->pull.subreq != NULL) {
tlss->waiting_flush.mgmt_req = req;
return;
}
tevent_req_done(req);
}