From: Nick Porter <nick@portercomputing.co.uk>
Date: Wed, 4 Sep 2024 10:40:14 +0000 (+0100)
Subject: More connection_t related UBSAN false positives
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=909e7ba026c0dd9f8d51f8c2061fe3d3f340049c;p=thirdparty%2Ffreeradius-server.git

More connection_t related UBSAN false positives
---

diff --git a/src/lib/ldap/connection.c b/src/lib/ldap/connection.c
index b0bf7f54be..8094c169d6 100644
--- a/src/lib/ldap/connection.c
+++ b/src/lib/ldap/connection.c
@@ -338,6 +338,7 @@ static void _ldap_connection_close_watch(connection_t *conn, UNUSED connection_s
  *	- CONNECTION_STATE_CONNECTING on success.
  *	- CONNECTION_STATE_FAILED on failure.
  */
+CC_NO_UBSAN(function) /* UBSAN: false positive - public vs private connection_t trips --fsanitize=function*/
 static connection_state_t _ldap_connection_init(void **h, connection_t *conn, void *uctx)
 {
 	fr_ldap_config_t const	*config = uctx;
diff --git a/src/lib/redis/io.c b/src/lib/redis/io.c
index 9e873dabd9..476aefdc5a 100644
--- a/src/lib/redis/io.c
+++ b/src/lib/redis/io.c
@@ -302,6 +302,7 @@ static int _redis_handle_free(fr_redis_handle_t *h)
  *	- #CONNECTION_STATE_CONNECTING	if a file descriptor was successfully created.
  *	- #CONNECTION_STATE_FAILED		if we could not open a valid handle.
  */
+CC_NO_UBSAN(function) /* UBSAN: false positive - public vs private connection_t trips --fsanitize=function*/
 static connection_state_t _redis_io_connection_init(void **h_out, connection_t *conn, void *uctx)
 {
 	fr_redis_io_conf_t	*conf = uctx;
diff --git a/src/modules/rlm_logtee/rlm_logtee.c b/src/modules/rlm_logtee/rlm_logtee.c
index b32db1099c..6893a40d06 100644
--- a/src/modules/rlm_logtee/rlm_logtee.c
+++ b/src/modules/rlm_logtee/rlm_logtee.c
@@ -387,6 +387,7 @@ static connection_state_t _logtee_conn_open(UNUSED fr_event_list_t *el, UNUSED v
  * @param[in] conn	being initialised.
  * @param[in] uctx	A #rlm_logtee_thread_t.
  */
+CC_NO_UBSAN(function) /* UBSAN: false positive - public vs private connection_t trips --fsanitize=function*/
 static connection_state_t _logtee_conn_init(void **h_out, connection_t *conn, void *uctx)
 {
 	rlm_logtee_thread_t	*t = talloc_get_type_abort(uctx, rlm_logtee_thread_t);
diff --git a/src/modules/rlm_radius/rlm_radius_udp.c b/src/modules/rlm_radius/rlm_radius_udp.c
index 3dd3bfa56d..41fa0cd993 100644
--- a/src/modules/rlm_radius/rlm_radius_udp.c
+++ b/src/modules/rlm_radius/rlm_radius_udp.c
@@ -709,6 +709,7 @@ static int _udp_handle_free(udp_handle_t *h)
  * @param[in] conn	to initialise.
  * @param[in] uctx	A #udp_thread_t
  */
+CC_NO_UBSAN(function) /* UBSAN: false positive - public vs private connection_t trips --fsanitize=function*/
 static connection_state_t conn_init(void **h_out, connection_t *conn, void *uctx)
 {
 	int			fd;
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index d42cadcd42..7f708ab769 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -251,6 +251,7 @@ static void _sql_connect_query_run(connection_t *conn, UNUSED connection_state_t
 	}
 }
 
+CC_NO_UBSAN(function) /* UBSAN: false positive - public vs private connection_t trips --fsanitize=function*/
 static connection_state_t _sql_connection_init(void **h, connection_t *conn, void *uctx)
 {
 	rlm_sql_t const		*sql = talloc_get_type_abort_const(uctx, rlm_sql_t);
@@ -840,6 +841,7 @@ static size_t sql_escape_func(UNUSED request_t *request, char *out, size_t outle
  * @param[in] log_prefix	What to prefix log messages with.
  * @param[in] uctx		User context passed to trunk_alloc.
  */
+CC_NO_UBSAN(function) /* UBSAN: false positive - public vs private connection_t trips --fsanitize=function*/
 static connection_t *sql_trunk_connection_alloc(trunk_connection_t *tconn, fr_event_list_t *el,
 						   connection_conf_t const *conn_conf,
 						   char const *log_prefix, void *uctx)
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
index 31dcaacc25..304994a144 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
@@ -267,6 +267,7 @@ static void _sql_connect_io_notify(fr_event_list_t *el, int fd, UNUSED int flags
 	}
 }
 
+CC_NO_UBSAN(function) /* UBSAN: false positive - public vs private connection_t trips --fsanitize=function*/
 static connection_state_t _sql_connection_init(void **h, connection_t *conn, void *uctx)
 {
 	rlm_sql_t const			*sql = talloc_get_type_abort_const(uctx, rlm_sql_t);
@@ -342,6 +343,7 @@ static void _sql_connection_close(fr_event_list_t *el, void *h, UNUSED void *uct
 	talloc_free(h);
 }
 
+CC_NO_UBSAN(function) /* UBSAN: false positive - public vs private connection_t trips --fsanitize=function*/
 static connection_t *sql_trunk_connection_alloc(trunk_connection_t *tconn, fr_event_list_t *el,
 						connection_conf_t const *conn_conf,
 						char const *log_prefix, void *uctx)