From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Fri, 6 Dec 2024 16:46:35 +0000 (+0100)
Subject: MINOR: mux-spop: use explicit __objt_server on idle conn reinsert
X-Git-Tag: v3.2-dev1~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=17782848246f4904e6c972bf2ffd1c2e94233946;p=thirdparty%2Fhaproxy.git

MINOR: mux-spop: use explicit __objt_server on idle conn reinsert

This commit is the counterpart of the previous one for SPOP mux. It
replaces objt_server() by unsafe __objt_server(), as conn target is
guarantee to point to a valid server instance, which can then be used as
_srv_add_idle() argument.

This should fix coverity report from github issue #2811.
---

diff --git a/src/mux_spop.c b/src/mux_spop.c
index 5766889532..96d62d0f81 100644
--- a/src/mux_spop.c
+++ b/src/mux_spop.c
@@ -2492,7 +2492,7 @@ static struct task *spop_io_cb(struct task *t, void *ctx, unsigned int state)
 		t = NULL;
 
 	if (!ret && conn_in_list) {
-		struct server *srv = objt_server(conn->target);
+		struct server *srv = __objt_server(conn->target);
 
 		HA_SPIN_LOCK(IDLE_CONNS_LOCK, &idle_conns[tid].idle_conns_lock);
 		_srv_add_idle(srv, conn, conn_in_list == CO_FL_SAFE_LIST);