michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: tcp2: Handle the packet clone error in tcp_data_get()

Browse source 
Unsuccessfull packet clone in tcp_data_get() isn't handled,
add an error handling and don't ACK the incoming data in this case.

Signed-off-by: Jukka Rissanen <jukka.rissanen@linux.intel.com>
Signed-off-by: Oleg Zhurakivskyy <oleg.zhurakivskyy@intel.com>
This commit is contained in:
Oleg Zhurakivskyy 2020-05-13 14:07:07 +03:00 • committed by Carles Cufí
commit 13bcfc165a
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
subsys/net/ip/tcp2.c
View file

@ -462,7 +462,13 @@ static size_t tcp_data_get(struct tcp *conn, struct net_pkt *pkt)
if (len > 0) {
if (conn->context->recv_cb) {
struct net_pkt *up = net_pkt_clone(pkt, K_NO_WAIT);
struct net_pkt *up =
net_pkt_clone(pkt, TCP_PKT_ALLOC_TIMEOUT);
if (!up) {
len = -ENOBUFS;
goto out;
}
net_pkt_cursor_init(up);
net_pkt_set_overwrite(up, true);
@ -886,7 +892,9 @@ next_state:
net_context_set_state(conn->context,
NET_CONTEXT_CONNECTED);
if (len) {
tcp_data_get(conn, pkt);
if (tcp_data_get(conn, pkt) < 0) {
break;
}
conn_ack(conn, + len);
tcp_out(conn, ACK);
}
@ -903,7 +911,9 @@ next_state:
net_context_set_state(conn->context,
NET_CONTEXT_CONNECTED);
if (FL(&fl, &, PSH)) {
tcp_data_get(conn, pkt);
if (tcp_data_get(conn, pkt) < 0) {
break;
}
}
if (FL(&fl, &, SYN)) {
conn_ack(conn, th_seq(th) + 1);
@ -927,7 +937,9 @@ next_state:
if (len) {
if (th_seq(th) == conn->ack) {
tcp_data_get(conn, pkt);
if (tcp_data_get(conn, pkt) < 0) {
break;
}
conn_ack(conn, + len);
tcp_out(conn, ACK);
} else if (net_tcp_seq_greater(conn->ack, th_seq(th))) {