mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-11-29 14:50:59 +01:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: mux-quic: fix leak if cs alloc failure

Browse Source 
qcs and its field are not properly freed if the conn-stream allocation
fail in qcs_new(). Fix this by having a proper deinit code with a
dedicated label.
This commit is contained in:
Amaury Denoyelle 2022-04-27 15:09:27 +02:00
parent 408d226aa1
commit 17014a64bf
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/mux_quic.c
View File

@ -105,35 +105,32 @@ INITCALL1(STG_REGISTER, trace_register_source, TRACE_SOURCE);
struct qcs *qcs_new(struct qcc *qcc, uint64_t id, enum qcs_type type) struct qcs *qcs_new(struct qcc *qcc, uint64_t id, enum qcs_type type)
{ {
struct qcs *qcs; struct qcs *qcs;
struct qc_stream_desc *stream;
TRACE_ENTER(QMUX_EV_QCS_NEW, qcc->conn); TRACE_ENTER(QMUX_EV_QCS_NEW, qcc->conn);
qcs = pool_alloc(pool_head_qcs); qcs = pool_alloc(pool_head_qcs);
if (!qcs) if (!qcs)
goto out; return NULL;
qcs->stream = NULL;
qcs->qcc = qcc;
qcs->cs = NULL;
qcs->flags = QC_SF_NONE;
/* allocate transport layer stream descriptor /* allocate transport layer stream descriptor
* *
* TODO qc_stream_desc is only useful for Tx buffering. It should not * TODO qc_stream_desc is only useful for Tx buffering. It should not
* be required for unidirectional remote streams. * be required for unidirectional remote streams.
*/ */
stream = qc_stream_desc_new(id, qcs, qcc->conn->handle.qc); qcs->stream = qc_stream_desc_new(id, qcs, qcc->conn->handle.qc);
if (!stream) { if (!qcs->stream)
pool_free(pool_head_qcs, qcs); goto err;
qcs = NULL;
goto out;
}
qcs->stream = stream;
qcs->qcc = qcc;
qcs->cs = NULL;
qcs->flags = QC_SF_NONE;
qcs->endp = cs_endpoint_new(); qcs->endp = cs_endpoint_new();
if (!qcs->endp) { if (!qcs->endp) {
pool_free(pool_head_qcs, qcs); pool_free(pool_head_qcs, qcs);
return NULL; goto err;
} }
qcs->endp->target = qcs; qcs->endp->target = qcs;
qcs->endp->ctx = qcc->conn; qcs->endp->ctx = qcc->conn;
@ -166,6 +163,13 @@ struct qcs *qcs_new(struct qcc *qcc, uint64_t id, enum qcs_type type)
out: out:
TRACE_LEAVE(QMUX_EV_QCS_NEW, qcc->conn, qcs); TRACE_LEAVE(QMUX_EV_QCS_NEW, qcc->conn, qcs);
return qcs; return qcs;
err:
if (qcs->stream)
qc_stream_desc_release(qcs->stream);
pool_free(pool_head_qcs, qcs);
return NULL;
} }
/* Free a qcs. This function must only be done to remove a stream on allocation /* Free a qcs. This function must only be done to remove a stream on allocation