RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-19 04:00:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: queue: make sure pendconn->strm->pend_pos is always valid

Browse Source 
pendconn_add() used to assign strm->pend_pos very late, after unlocking
the queue, so that a watching thread could see a random value in
pendconn->strm->pend_pos even while holding the lock on the element and
the queue itself. While there's currently nothing wrong with this, it
costs nothing to arrange it and will simplify code analysis later.
This commit is contained in:
Willy Tarreau 2018-07-26 07:33:44 +02:00
parent 6bdd05c0ef
commit c1a60d6218
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/queue.c
View File

@ -71,9 +71,6 @@
* queue to be locked/unlocked.
*
* - a pendconn doesn't switch between queues, it stays where it is.
*
* - strm->pend_pos is assigned late so pendconn->strm->pend_pos could be met
* uninitialized by another thread and must not be relied on.
*/
#include <common/config.h>
@ -318,6 +315,7 @@ struct pendconn *pendconn_add(struct stream *strm)
if (srv->nbpend > srv->counters.nbpend_max)
srv->counters.nbpend_max = srv->nbpend;
LIST_ADDQ(&srv->pendconns, &p->list);
strm->pend_pos = p;
HA_SPIN_UNLOCK(SERVER_LOCK, &srv->lock);
}
else {
@ -327,10 +325,10 @@ struct pendconn *pendconn_add(struct stream *strm)
if (px->nbpend > px->be_counters.nbpend_max)
px->be_counters.nbpend_max = px->nbpend;
LIST_ADDQ(&px->pendconns, &p->list);
strm->pend_pos = p;
HA_SPIN_UNLOCK(PROXY_LOCK, &px->lock);
}
HA_ATOMIC_ADD(&px->totpend, 1);
strm->pend_pos = p;
return p;
}