1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG/MAJOR: ssl/ocsp: fix NULL conn object dereferencing to access QUIC TLS counters

Browse Source 
This bug arrived with this commit in the current dev branch:

	056ec51c26 MEDIUM: ssl/ocsp: counters for OCSP stapling

and could occur for QUIC connections during handshake when the underlying
<conn> connection object is not already initialized. So in this case the TLS
counters attached to TLS listeners cannot be accessed through this object but
from the QUIC connection object.

Modify the code to initialize the listener (<li> variable) for both QUIC
and TCP connections, then initialize the variables for the TLS counters
if the listener is also initialized.

Thank you to @Tristan971 for having reported this issue in GH #2833.

Must be backported with the commit mentioned above if it is planned to be
backported.
This commit is contained in:
Frederic Lecaille 2025-01-06 11:06:55 +01:00
parent 892eb2bb2c
commit d7fc90afe9
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ssl_ocsp.c
View File

@ -53,6 +53,7 @@
#include <haproxy/log.h>
#include <haproxy/openssl-compat.h>
#include <haproxy/proxy.h>
#include <haproxy/quic_conn-t.h>
#include <haproxy/shctx.h>
#include <haproxy/ssl_ckch.h>
#include <haproxy/ssl_ocsp-t.h>
@ -100,7 +101,7 @@ int ssl_sock_get_ocsp_arg_kt_index(int evp_keytype)
int ssl_sock_ocsp_stapling_cbk(SSL *ssl, void *arg)
{
struct connection *conn = SSL_get_ex_data(ssl, ssl_app_data_index);
struct listener *li;
struct listener *li = NULL;
struct ssl_counters *counters = NULL;
struct ssl_counters *counters_px = NULL;
struct certificate_ocsp *ocsp;
@ -115,8 +116,18 @@ int ssl_sock_ocsp_stapling_cbk(SSL *ssl, void *arg)
if (!ctx)
goto error;
if (obj_type(conn->target) == OBJ_TYPE_LISTENER) {
if (conn && obj_type(conn->target) == OBJ_TYPE_LISTENER)
li = __objt_listener(conn->target);
#ifdef USE_QUIC
else if (!conn) {
struct quic_conn *qc = SSL_get_ex_data(ssl, ssl_qc_app_data_index);
/* null if not a listener */
li = qc->li;
}
#endif
if (li) {
counters = EXTRA_COUNTERS_GET(li->extra_counters, &ssl_stats_module);
counters_px = EXTRA_COUNTERS_GET(li->bind_conf->frontend->extra_counters_fe, &ssl_stats_module);
}