aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2020-08-07 12:34:11 +0300
committerSergey Kandaurov <pluknet@nginx.com>2020-08-07 12:34:11 +0300
commit7d1a1fb6de71ba0ad7ac324a6c43a10a0f5d8ae6 (patch)
tree47042105d555784b6d7caefd946e530640800764 /src
parent4ded4e3402b7e2ec847e55e47aaa44728a139665 (diff)
downloadnginx-7d1a1fb6de71ba0ad7ac324a6c43a10a0f5d8ae6.tar.gz
nginx-7d1a1fb6de71ba0ad7ac324a6c43a10a0f5d8ae6.zip
QUIC: fixed possible use-after-free on stream cleanup.
A QUIC stream could be destroyed by handler while in ngx_quic_stream_input(). To detect this, ngx_quic_find_stream() is used to check that it still exists. Previously, a stream id was passed to this routine off the frame structure. In case of stream cleanup, it is freed along with other frames belonging to the stream on cleanup. Then, a cleanup handler reuses last frames to update MAX_STREAMS and serve other purpose. Thus, ngx_quic_find_stream() is passed a reused frame with zeroed out part pointed by stream_id. If a stream with id 0x0 still exists, this leads to use-after-free.
Diffstat (limited to 'src')
-rw-r--r--src/event/ngx_event_quic.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c
index 7c7620322..47c52067e 100644
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -3006,6 +3006,7 @@ ngx_quic_handle_stream_frame(ngx_connection_t *c, ngx_quic_header_t *pkt,
static ngx_int_t
ngx_quic_stream_input(ngx_connection_t *c, ngx_quic_frame_t *frame, void *data)
{
+ uint64_t id;
ngx_buf_t *b;
ngx_event_t *rev;
ngx_quic_stream_t *sn;
@@ -3016,6 +3017,7 @@ ngx_quic_stream_input(ngx_connection_t *c, ngx_quic_frame_t *frame, void *data)
sn = data;
f = &frame->u.stream;
+ id = f->stream_id;
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, "quic existing stream");
@@ -3046,7 +3048,7 @@ ngx_quic_stream_input(ngx_connection_t *c, ngx_quic_frame_t *frame, void *data)
}
/* check if stream was destroyed by handler */
- if (ngx_quic_find_stream(&qc->streams.tree, f->stream_id) == NULL) {
+ if (ngx_quic_find_stream(&qc->streams.tree, id) == NULL) {
return NGX_DONE;
}