upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-06-13 19:00:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

MINOR: quic: Wrong datagram buffer passed to quic_lstnr_dgram_dispatch()

Browse source 
The same datagram could be passed to quic_lstnr_dgram_dispatch() before
being consumed by qc_lstnr_pkt_rcv() leading to a wrong decryption for the packet
number decryption, then a decryption error for the data. This was due to
a wrong datagram buffer passed to quic_lstnr_dgram_dispatch(). The datagram data
which must be passed to quic_lstnr_dgram_dispatch() are the same as the one
passed to recvfrom().
This commit is contained in:
Frédéric Lécaille 2022-02-02 09:44:22 +01:00 committed by Amaury Denoyelle
parent 841bf5e7f4
commit f6f7520b9b
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/quic_sock.c
View file

@ -176,6 +176,7 @@ void quic_sock_fd_iocb(int fd)
size_t max_sz, cspace;
socklen_t saddrlen;
struct quic_dgram *dgram, *dgramp, *new_dgram;
unsigned char *dgram_buf;
BUG_ON(!l);
@ -224,11 +225,13 @@ void quic_sock_fd_iocb(int fd)
b_add(buf, cspace);
if (b_contig_space(buf) < max_sz)
goto out;
}
dgram_buf = (unsigned char *)b_tail(buf);
saddrlen = sizeof saddr;
do {
ret = recvfrom(fd, b_tail(buf), max_sz, 0,
ret = recvfrom(fd, dgram_buf, max_sz, 0,
(struct sockaddr *)&saddr, &saddrlen);
if (ret < 0) {
if (errno == EINTR)
@ -240,8 +243,8 @@ void quic_sock_fd_iocb(int fd)
} while (0);
b_add(buf, ret);
if (!quic_lstnr_dgram_dispatch((unsigned char *)b_head(buf), ret,
l, &saddr, new_dgram, &rxbuf->dgrams)) {
if (!quic_lstnr_dgram_dispatch(dgram_buf, ret, l, &saddr,
new_dgram, &rxbuf->dgrams)) {
/* If wrong, consume this datagram */
b_del(buf, ret);
}