diff options
author | Eric Dumazet <edumazet@google.com> | 2018-07-23 09:28:20 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-23 12:01:36 -0700 |
commit | 8541b21e781a22dce52a74fef0b9bed00404a1cd (patch) | |
tree | d86d5837152ca635fc33f08a1f81a81124c944eb /net/ipv4 | |
parent | 3d4bf93ac12003f9b8e1e2de37fe27983deebdcf (diff) | |
download | linux-stable-8541b21e781a22dce52a74fef0b9bed00404a1cd.tar.gz linux-stable-8541b21e781a22dce52a74fef0b9bed00404a1cd.tar.bz2 linux-stable-8541b21e781a22dce52a74fef0b9bed00404a1cd.zip |
tcp: call tcp_drop() from tcp_data_queue_ofo()
In order to be able to give better diagnostics and detect
malicious traffic, we need to have better sk->sk_drops tracking.
Fixes: 9f5afeae5152 ("tcp: use an RB tree for ooo receive queue")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r-- | net/ipv4/tcp_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index 78068b902e7b..b062a7692238 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4510,7 +4510,7 @@ coalesce_done: /* All the bits are present. Drop. */ NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE); - __kfree_skb(skb); + tcp_drop(sk, skb); skb = NULL; tcp_dsack_set(sk, seq, end_seq); goto add_sack; @@ -4529,7 +4529,7 @@ coalesce_done: TCP_SKB_CB(skb1)->end_seq); NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFOMERGE); - __kfree_skb(skb1); + tcp_drop(sk, skb1); goto merge_right; } } else if (tcp_try_coalesce(sk, skb1, |