patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

net: tcp: Add build in auto check for reordering

Browse source 
The reorder process in rather complicated. Add a runtime check to always
check afterwards if the reordering queue is still consistent. When this
test fails, discard the contents of the complete reorder buffer.

Signed-off-by: Sjors Hettinga <s.a.hettinga@gmail.com>
This commit is contained in:
Sjors Hettinga 2022-08-22 22:17:07 +02:00 committed by Fabio Baltieri
parent 39328e8836
commit 74772abfd2
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
subsys/net/ip/tcp.c
View file

@ -1810,18 +1810,30 @@ static bool tcp_validate_seq(struct tcp *conn, struct tcphdr *hdr)
(net_tcp_seq_cmp(th_seq(hdr), conn->ack + conn->recv_win) < 0);
}
static void print_seq_list(struct net_buf *buf)
static bool check_seq_list(struct net_buf *buf)
{
struct net_buf *last = NULL;
struct net_buf *tmp = buf;
uint32_t seq;
uint32_t next_seq = 0;
bool result = true;
while (tmp) {
seq = tcp_get_seq(tmp);
NET_DBG("buf %p seq %u len %d", tmp, seq, tmp->len);
if (last != NULL) {
if (next_seq != seq) {
result = false;
}
}
next_seq = seq + tmp->len;
last = tmp;
tmp = tmp->frags;
}
return result;
}
static void tcp_queue_recv_data(struct tcp *conn, struct net_pkt *pkt,
@ -1847,7 +1859,6 @@ static void tcp_queue_recv_data(struct tcp *conn, struct net_pkt *pkt,
if (IS_ENABLED(CONFIG_NET_TCP_LOG_LEVEL_DBG)) {
NET_DBG("Queuing data: conn %p", conn);
print_seq_list(pkt->buffer);
}
if (!net_pkt_is_empty(conn->queue_recv_data)) {
@ -1932,13 +1943,17 @@ static void tcp_queue_recv_data(struct tcp *conn, struct net_pkt *pkt,
}
}
if (IS_ENABLED(CONFIG_NET_TCP_LOG_LEVEL_DBG)) {
if (inserted) {
NET_DBG("All pending data: conn %p", conn);
print_seq_list(conn->queue_recv_data->buffer);
} else {
NET_DBG("Cannot add new data to queue");
if (inserted) {
NET_DBG("All pending data: conn %p", conn);
if (check_seq_list(conn->queue_recv_data->buffer) == false) {
NET_ERR("Incorrect order in out of order sequence for conn %p",
conn);
/* error in sequence list, drop it */
net_buf_unref(conn->queue_recv_data->buffer);
conn->queue_recv_data->buffer = NULL;
}
} else {
NET_DBG("Cannot add new data to queue");
}
} else {
net_pkt_append_buffer(conn->queue_recv_data, pkt->buffer);