aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_resolver.c
diff options
context:
space:
mode:
authorSergey Kandaurov <pluknet@nginx.com>2019-09-10 15:42:34 +0300
committerSergey Kandaurov <pluknet@nginx.com>2019-09-10 15:42:34 +0300
commit4cd1dd28ddd91a15720febc491917da5ba16dbe6 (patch)
treedb8f12c6c3f831fcfd3b1b8f219434f87090a3f1 /src/core/ngx_resolver.c
parentc3f8098712d16e17a6577e203a8c0dc76331a1ee (diff)
downloadnginx-4cd1dd28ddd91a15720febc491917da5ba16dbe6.tar.gz
nginx-4cd1dd28ddd91a15720febc491917da5ba16dbe6.zip
Resolver: fixed possible use-after-free while resolving PTR.
Previously, if a response to the PTR request was cached, and ngx_resolver_dup() failed to allocate memory for the resulting name, then the original node was freed but left in expire_queue. A subsequent address resolving would end up in a use-after-free memory access of the node either in ngx_resolver_expire() or ngx_resolver_process_ptr(), when accessing it through expire_queue. The fix is to leave the resolver node intact.
Diffstat (limited to 'src/core/ngx_resolver.c')
-rw-r--r--src/core/ngx_resolver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/ngx_resolver.c b/src/core/ngx_resolver.c
index 593645d5d..e51712c0a 100644
--- a/src/core/ngx_resolver.c
+++ b/src/core/ngx_resolver.c
@@ -972,7 +972,8 @@ ngx_resolve_addr(ngx_resolver_ctx_t *ctx)
name = ngx_resolver_dup(r, rn->name, rn->nlen);
if (name == NULL) {
- goto failed;
+ ngx_resolver_free(r, ctx);
+ return NGX_ERROR;
}
ctx->name.len = rn->nlen;