[nginx] OCSP: resolve cleanup on connection close.
Maxim Dounin
mdounin at mdounin.ru
Tue May 19 02:46:31 UTC 2026
details: http://freenginx.org/hg/nginx/rev/2c3807852ed8
branches:
changeset: 9523:2c3807852ed8
user: Roman Arutyunyan <arut at nginx.com>
date: Tue Apr 21 14:51:41 2026 +0400
description:
OCSP: resolve cleanup on connection close.
Previously, when a client SSL connection was terminated (typically due to a
timeout) while resolving an OCSP responder, the OCSP context was freed, but
the resolve context was not. This resulted in use-after-free on resolve
completion.
Reported by Leo Lin.
Obtained from:
https://github.com/nginx/nginx/commit/71841dcedfdf46048ef5e25413fdf97a66957913
diffstat:
src/event/ngx_event_openssl_stapling.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diffs (50 lines):
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c
--- a/src/event/ngx_event_openssl_stapling.c
+++ b/src/event/ngx_event_openssl_stapling.c
@@ -111,6 +111,7 @@ struct ngx_ssl_ocsp_ctx_s {
ngx_resolver_t *resolver;
ngx_msec_t resolver_timeout;
+ ngx_resolver_ctx_t *resolve;
ngx_msec_t timeout;
@@ -1303,6 +1304,10 @@ ngx_ssl_ocsp_done(ngx_ssl_ocsp_ctx_t *ct
ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ctx->log, 0,
"ssl ocsp done");
+ if (ctx->resolve) {
+ ngx_resolve_name_done(ctx->resolve);
+ }
+
if (ctx->peer.connection) {
ngx_close_connection(ctx->peer.connection);
}
@@ -1395,7 +1400,10 @@ ngx_ssl_ocsp_request(ngx_ssl_ocsp_ctx_t
resolve->data = ctx;
resolve->timeout = ctx->resolver_timeout;
+ ctx->resolve = resolve;
+
if (ngx_resolve_name(resolve) != NGX_OK) {
+ ctx->resolve = NULL;
ngx_ssl_ocsp_error(ctx);
return;
}
@@ -1484,6 +1492,7 @@ ngx_ssl_ocsp_resolve_handler(ngx_resolve
}
ngx_resolve_name_done(resolve);
+ ctx->resolve = NULL;
ngx_ssl_ocsp_connect(ctx);
return;
@@ -1491,6 +1500,8 @@ ngx_ssl_ocsp_resolve_handler(ngx_resolve
failed:
ngx_resolve_name_done(resolve);
+ ctx->resolve = NULL;
+
ngx_ssl_ocsp_error(ctx);
}
More information about the nginx-devel
mailing list