diff options
author | Amaury Denoyelle <adenoyelle@haproxy.com> | 2023-05-11 17:00:54 +0200 |
---|---|---|
committer | Amaury Denoyelle <adenoyelle@haproxy.com> | 2023-05-12 15:52:19 +0200 |
commit | d00b3093c9c60883e3abe96dcd521e670731ac84 (patch) | |
tree | 6f34d258e48ad89ac62f28a5a536bafa18dcbdbe | |
parent | 0abde9dee69fe151f5f181a34e0782ef840abe53 (diff) | |
download | haproxy-d00b3093c9c60883e3abe96dcd521e670731ac84.tar.gz |
BUG/MINOR: mux-quic: handle properly recv ncbuf alloc failure
The function qc_get_ncbuf() is used to allocate a ncbuf content.
Allocation failure was handled using a plain BUG_ON.
Fix this by a proper error management. This buffer is only used for
STREAM frame reception to support out-of-order offsets. When an
allocation failed, close the connection with a QUIC internal error code.
This should be backported up to 2.6.
-rw-r--r-- | src/mux_quic.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/mux_quic.c b/src/mux_quic.c index 294a0d7b8..e74bae009 100644 --- a/src/mux_quic.c +++ b/src/mux_quic.c @@ -426,13 +426,17 @@ struct buffer *qc_get_buf(struct qcs *qcs, struct buffer *bptr) return b_alloc(bptr); } +/* Allocate if needed buffer <ncbuf> for stream <qcs>. + * + * Returns the buffer instance or NULL on allocation failure. + */ static struct ncbuf *qc_get_ncbuf(struct qcs *qcs, struct ncbuf *ncbuf) { struct buffer buf = BUF_NULL; if (ncb_is_null(ncbuf)) { - b_alloc(&buf); - BUG_ON(b_is_null(&buf)); + if (!b_alloc(&buf)) + return NULL; *ncbuf = ncb_make(buf.area, buf.size, 0); ncb_init(ncbuf, 0); @@ -1043,9 +1047,9 @@ int qcc_recv(struct qcc *qcc, uint64_t id, uint64_t len, uint64_t offset, } if (!qc_get_ncbuf(qcs, &qcs->rx.ncbuf) || ncb_is_null(&qcs->rx.ncbuf)) { - /* TODO should mark qcs as full */ - ABORT_NOW(); - return 1; + TRACE_ERROR("receive ncbuf alloc failure", QMUX_EV_QCC_RECV|QMUX_EV_QCS_RECV, qcc->conn, qcs); + qcc_set_error(qcc, QC_ERR_INTERNAL_ERROR, 0); + goto err; } TRACE_DATA("newly received offset", QMUX_EV_QCC_RECV|QMUX_EV_QCS_RECV, qcc->conn, qcs); |