]> git.kaiwu.me - nginx.git/commitdiff
HTTP/3: fixed segfault when using SSL certificates with variables.
authorSergey Kandaurov <pluknet@nginx.com>
Wed, 29 Sep 2021 12:01:59 +0000 (15:01 +0300)
committerSergey Kandaurov <pluknet@nginx.com>
Wed, 29 Sep 2021 12:01:59 +0000 (15:01 +0300)
A QUIC connection doesn't have c->log->data and friends initialized to sensible
values.  Yet, a request can be created in the certificate callback with such an
assumption, which leads to a segmentation fault due to null pointer dereference
in ngx_http_free_request().  The fix is to adjust initializing the QUIC part of
a connection such that it has all of that in place.

Further, this appends logging error context for unsuccessful QUIC handshakes:
- cannot load certificate .. while handling frames
- SSL_do_handshake() failed .. while sending frames

src/http/modules/ngx_http_quic_module.c
src/http/ngx_http_request.c

index b41c069b657b07faff15522ff094f84a6ed5049c..ce13a223f6cea65e38b00f112e6e82aa416e384d 100644 (file)
@@ -198,8 +198,6 @@ ngx_http_quic_init(ngx_connection_t *c)
     hc->ssl = 1;
 
     if (c->quic == NULL) {
-        c->log->connection = c->number;
-
         qcf = ngx_http_get_module_srv_conf(hc->conf_ctx, ngx_http_quic_module);
 
         ngx_quic_run(c, qcf);
index 2b838cfc30862c4ec2c5ae0b7c0fd968b505fc22..6496a54003f30928a91a1002c1f8f6c07dd6d4f4 100644 (file)
@@ -299,14 +299,6 @@ ngx_http_init_connection(ngx_connection_t *c)
     /* the default server configuration for the address:port */
     hc->conf_ctx = hc->addr_conf->default_server->ctx;
 
-#if (NGX_HTTP_QUIC)
-    if (hc->addr_conf->quic) {
-        if (ngx_http_quic_init(c) == NGX_DONE) {
-            return;
-        }
-    }
-#endif
-
     ctx = ngx_palloc(c->pool, sizeof(ngx_http_log_ctx_t));
     if (ctx == NULL) {
         ngx_http_close_connection(c);
@@ -324,6 +316,14 @@ ngx_http_init_connection(ngx_connection_t *c)
 
     c->log_error = NGX_ERROR_INFO;
 
+#if (NGX_HTTP_QUIC)
+    if (hc->addr_conf->quic) {
+        if (ngx_http_quic_init(c) == NGX_DONE) {
+            return;
+        }
+    }
+#endif
+
     rev = c->read;
     rev->handler = ngx_http_wait_request_handler;
     c->write->handler = ngx_http_empty_handler;