RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-01-05 03:29:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: dns: fix ring offset calculation in dns_resolve_send()

Browse Source 
With 737d10f ("BUG/MEDIUM: dns: ensure ring offset is properly reajusted
to head") relative offset calculation was fixed in dns_session_io_handler()
and dns_process_req() functions.

But if we compare with the changes performed in the patch that introduced
the bug: d9c7188 ("MEDIUM: ring: make the offset relative to the head/tail
instead of absolute"), we can see that dns_resolve_send() is missing from
the patch.

Applying both 737d10f + ("BUG/MINOR: dns: fix ring offset calculation on
first read") to dns_resolve_send() function.
With this last commit, we should be back at pre d9c7188 behavior.

No backport needed.
This commit is contained in:
Aurelien DARRAGON 2023-03-07 18:01:34 +01:00 committed by Amaury Denoyelle
parent 5a43db2c5d
commit bce0c0c37a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dns.c
View File

@ -317,7 +317,6 @@ static void dns_resolve_send(struct dgram_conn *dgram)
buf = &ring->buf; buf = &ring->buf;
HA_RWLOCK_RDLOCK(DNS_LOCK, &ring->lock); HA_RWLOCK_RDLOCK(DNS_LOCK, &ring->lock);
ofs = ns->dgram->ofs_req;
/* explanation for the initialization below: it would be better to do /* explanation for the initialization below: it would be better to do
* this in the parsing function but this would occasionally result in * this in the parsing function but this would occasionally result in
@ -327,14 +326,17 @@ static void dns_resolve_send(struct dgram_conn *dgram)
* existing messages before grabbing a reference to a location. This * existing messages before grabbing a reference to a location. This
* value cannot be produced after initialization. * value cannot be produced after initialization.
*/ */
if (unlikely(ofs == ~0)) { if (unlikely(ns->dgram->ofs_req == ~0)) {
ofs = 0; ns->dgram->ofs_req = b_peek_ofs(buf, 0);
HA_ATOMIC_INC(b_peek(buf, ofs)); HA_ATOMIC_INC(b_orig(buf) + ns->dgram->ofs_req);
} }
/* we were already there, adjust the offset to be relative to /* we were already there, adjust the offset to be relative to
* the buffer's head and remove us from the counter. * the buffer's head and remove us from the counter.
*/ */
ofs = ns->dgram->ofs_req - b_head_ofs(buf);
if (ns->dgram->ofs_req < b_head_ofs(buf))
ofs += b_size(buf);
BUG_ON(ofs >= buf->size); BUG_ON(ofs >= buf->size);
HA_ATOMIC_DEC(b_peek(buf, ofs)); HA_ATOMIC_DEC(b_peek(buf, ofs));
@ -376,12 +378,10 @@ static void dns_resolve_send(struct dgram_conn *dgram)
fd_stop_send(fd); fd_stop_send(fd);
out: out:
HA_ATOMIC_INC(b_peek(buf, ofs)); HA_ATOMIC_INC(b_peek(buf, ofs));
ns->dgram->ofs_req = ofs; ns->dgram->ofs_req = b_peek_ofs(buf, ofs);
HA_RWLOCK_RDUNLOCK(DNS_LOCK, &ring->lock); HA_RWLOCK_RDUNLOCK(DNS_LOCK, &ring->lock);
HA_SPIN_UNLOCK(DNS_LOCK, &dgram->lock); HA_SPIN_UNLOCK(DNS_LOCK, &dgram->lock);
} }
/* proto_udp callback functions for a DNS resolution */ /* proto_udp callback functions for a DNS resolution */