]> git.kaiwu.me - nginx.git/commitdiff
Resolver: fix non-current resolve finalization from resolve handler
authorRoman Arutyunyan <arut@nginx.com>
Wed, 28 Oct 2026 17:51:48 +0000 (21:51 +0400)
committerRoman Arutyunyan <arutyunyan.roman@gmail.com>
Wed, 11 Nov 2026 12:15:47 +0000 (16:15 +0400)
Previously, when a resolve handler called ngx_resolve_name_done() or
ngx_resolve_addr_done() for another resolve of the same name/address,
a use-after-free could happen while reporting the finalized resolve.
This may happen with upstream resolve when at least one subrequest is
resolving the same name, and the request is terminated from the
upstream resolve handler.

The problem occurs when finalizing a non-current resolve that is
already detached from rn->waiting and is about to be reported.  Such
cases produced "could not cancel" alerts.  The resolve may also be
detached with its node reset, while following a CNAME, in which case
no alert was produced.

Now the alerts are converted to debug messages and a finalizer is
installed into ctx->handler to release the context memory later.

Reported by Xint.io.

src/core/ngx_resolver.c

index 1ee86e4583166276c6ee2a9ea5326409ecb7199c..db31de89c4457933f6184cb9cb7631991dc08333 100644 (file)
@@ -106,6 +106,7 @@ static ngx_int_t ngx_resolver_copy(ngx_resolver_t *r, ngx_str_t *name,
 static ngx_int_t ngx_resolver_set_timeout(ngx_resolver_t *r,
     ngx_resolver_ctx_t *ctx);
 static void ngx_resolver_timeout_handler(ngx_event_t *ev);
+static void ngx_resolver_free_handler(ngx_resolver_ctx_t *ctx);
 static void ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn);
 static void *ngx_resolver_alloc(ngx_resolver_t *r, size_t size);
 static void *ngx_resolver_calloc(ngx_resolver_t *r, size_t size);
@@ -570,9 +571,11 @@ ngx_resolve_name_done(ngx_resolver_ctx_t *ctx)
                 w = w->next;
             }
 
-            ngx_log_error(NGX_LOG_ALERT, r->log, 0,
-                          "could not cancel %V resolving", &ctx->name);
+            ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
+                           "could not cancel %V resolving", &ctx->name);
         }
+
+        ctx->handler = ngx_resolver_free_handler;
     }
 
 done:
@@ -590,9 +593,12 @@ done:
 
     if (ctx->event) {
         ngx_resolver_free_locked(r, ctx->event);
+        ctx->event = NULL;
     }
 
-    ngx_resolver_free_locked(r, ctx);
+    if (ctx->handler != ngx_resolver_free_handler) {
+        ngx_resolver_free_locked(r, ctx);
+    }
 
     /* unlock alloc mutex */
 
@@ -1202,6 +1208,7 @@ ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
             }
         }
 
+#if (NGX_DEBUG)
         {
             u_char     text[NGX_SOCKADDR_STRLEN];
             ngx_str_t  addrtext;
@@ -1210,9 +1217,12 @@ ngx_resolve_addr_done(ngx_resolver_ctx_t *ctx)
             addrtext.len = ngx_sock_ntop(ctx->addr.sockaddr, ctx->addr.socklen,
                                          text, NGX_SOCKADDR_STRLEN, 0);
 
-            ngx_log_error(NGX_LOG_ALERT, r->log, 0,
-                          "could not cancel %V resolving", &addrtext);
+            ngx_log_debug1(NGX_LOG_DEBUG_CORE, r->log, 0,
+                           "could not cancel %V resolving", &addrtext);
         }
+#endif
+
+        ctx->handler = ngx_resolver_free_handler;
     }
 
 done:
@@ -1225,9 +1235,12 @@ done:
 
     if (ctx->event) {
         ngx_resolver_free_locked(r, ctx->event);
+        ctx->event = NULL;
     }
 
-    ngx_resolver_free_locked(r, ctx);
+    if (ctx->handler != ngx_resolver_free_handler) {
+        ngx_resolver_free_locked(r, ctx);
+    }
 
     /* unlock alloc mutex */
 
@@ -3005,6 +3018,11 @@ ngx_resolver_resolve_srv_names(ngx_resolver_ctx_t *ctx, ngx_resolver_node_t *rn)
     ngx_resolver_ctx_t       *cctx;
     ngx_resolver_srv_name_t  *srvs;
 
+    if (ctx->handler == ngx_resolver_free_handler) {
+        ctx->handler(ctx);
+        return;
+    }
+
     r = ctx->resolver;
 
     ctx->node = NULL;
@@ -4136,6 +4154,13 @@ ngx_resolver_timeout_handler(ngx_event_t *ev)
 }
 
 
+static void
+ngx_resolver_free_handler(ngx_resolver_ctx_t *ctx)
+{
+    ngx_resolver_free(ctx->resolver, ctx);
+}
+
+
 static void
 ngx_resolver_free_node(ngx_resolver_t *r, ngx_resolver_node_t *rn)
 {