diff options
author | Maxim Dounin <mdounin@mdounin.ru> | 2019-05-13 22:44:02 +0300 |
---|---|---|
committer | Maxim Dounin <mdounin@mdounin.ru> | 2019-05-13 22:44:02 +0300 |
commit | ce0f35317e16c85c1ccae8f3a0a1d6f2426b2e78 (patch) | |
tree | 9e0978cb306a8ef051cea2d63b9218f5e28fc66f /src/http | |
parent | a39380a41e7d7ceeda2c0526c5df474f158c6a53 (diff) |
Range filter: fixed loss of incoming chain links.
Filters are not allowed to change incoming chain links, and should allocate
their own links if any modifications are needed. Nevertheless
ngx_http_range_singlepart_body() modified incoming chain links in some
cases, notably at the end of the requested range.
No problems caused by this are currently known, mostly because of
limited number of possible modifications and the position of the range
body filter in the filter chain. Though this behaviour is clearly incorrect
and tests demonstrate that it can at least cause some proxy buffers being
lost when using proxy_force_ranges, leading to less effective handling
of responses.
Fix is to always allocate new chain links in ngx_http_range_singlepart_body().
Links are explicitly freed to ensure constant memory usage with long-lived
requests.
Diffstat (limited to 'src/http')
-rw-r--r-- | src/http/modules/ngx_http_range_filter_module.c | 54 |
1 files changed, 45 insertions, 9 deletions
diff --git a/src/http/modules/ngx_http_range_filter_module.c b/src/http/modules/ngx_http_range_filter_module.c index 819c5c942..8dd07205a 100644 --- a/src/http/modules/ngx_http_range_filter_module.c +++ b/src/http/modules/ngx_http_range_filter_module.c @@ -700,8 +700,9 @@ ngx_http_range_singlepart_body(ngx_http_request_t *r, ngx_http_range_filter_ctx_t *ctx, ngx_chain_t *in) { off_t start, last; + ngx_int_t rc; ngx_buf_t *buf; - ngx_chain_t *out, *cl, **ll; + ngx_chain_t *out, *cl, *tl, **ll; ngx_http_range_t *range; out = NULL; @@ -721,8 +722,18 @@ ngx_http_range_singlepart_body(ngx_http_request_t *r, "http range body buf: %O-%O", start, last); if (ngx_buf_special(buf)) { - *ll = cl; - ll = &cl->next; + + tl = ngx_alloc_chain_link(r->pool); + if (tl == NULL) { + return NGX_ERROR; + } + + tl->buf = buf; + tl->next = NULL; + + *ll = tl; + ll = &tl->next; + continue; } @@ -764,21 +775,46 @@ ngx_http_range_singlepart_body(ngx_http_request_t *r, buf->last_buf = (r == r->main) ? 1 : 0; buf->last_in_chain = 1; - *ll = cl; - cl->next = NULL; - break; + tl = ngx_alloc_chain_link(r->pool); + if (tl == NULL) { + return NGX_ERROR; + } + + tl->buf = buf; + tl->next = NULL; + + *ll = tl; + ll = &tl->next; + + continue; + } + + tl = ngx_alloc_chain_link(r->pool); + if (tl == NULL) { + return NGX_ERROR; } - *ll = cl; - ll = &cl->next; + tl->buf = buf; + tl->next = NULL; + + *ll = tl; + ll = &tl->next; } if (out == NULL) { return NGX_OK; } - return ngx_http_next_body_filter(r, out); + rc = ngx_http_next_body_filter(r, out); + + while (out) { + cl = out; + out = out->next; + ngx_free_chain(r->pool, cl); + } + + return rc; } |