diff options
| author | Eric Dumazet <edumazet@google.com> | 2012-09-05 23:34:44 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-09-07 12:56:00 -0400 |
| commit | 979402b16cde048ced4839e21cc49e0779352b80 (patch) | |
| tree | e2cb35c6029a59ba46e24fe933404b0f442ecb73 | |
| parent | 521130d11fd37b328543477df5522704a0e7cf2c (diff) | |
| download | linux-3.10-979402b16cde048ced4839e21cc49e0779352b80.tar.gz linux-3.10-979402b16cde048ced4839e21cc49e0779352b80.tar.bz2 linux-3.10-979402b16cde048ced4839e21cc49e0779352b80.zip | |
udp: increment UDP_MIB_INERRORS if copy failed
In UDP recvmsg(), we miss an increase of UDP_MIB_INERRORS if the copy
of skb to userspace failed for whatever reason.
Reported-by: Shawn Bohrer <sbohrer@rgmadvisors.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv4/udp.c | 5 | ||||
| -rw-r--r-- | net/ipv6/udp.c | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 6f6d1aca3c3..2814f66dac6 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -1226,6 +1226,11 @@ try_again: if (unlikely(err)) { trace_kfree_skb(skb, udp_recvmsg); + if (!peeked) { + atomic_inc(&sk->sk_drops); + UDP_INC_STATS_USER(sock_net(sk), + UDP_MIB_INERRORS, is_udplite); + } goto out_free; } diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 99d0077b56b..07e2bfef684 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -394,6 +394,17 @@ try_again: } if (unlikely(err)) { trace_kfree_skb(skb, udpv6_recvmsg); + if (!peeked) { + atomic_inc(&sk->sk_drops); + if (is_udp4) + UDP_INC_STATS_USER(sock_net(sk), + UDP_MIB_INERRORS, + is_udplite); + else + UDP6_INC_STATS_USER(sock_net(sk), + UDP_MIB_INERRORS, + is_udplite); + } goto out_free; } if (!peeked) { |