diff options
author | Eric Dumazet <edumazet@google.com> | 2012-09-05 19:34:44 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-09-07 12:56:00 -0400 |
commit | 979402b16cde048ced4839e21cc49e0779352b80 (patch) | |
tree | e2cb35c6029a59ba46e24fe933404b0f442ecb73 | |
parent | 521130d11fd37b328543477df5522704a0e7cf2c (diff) |
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 6f6d1aca3c3d..2814f66dac64 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -1226,6 +1226,11 @@ try_again: | |||
1226 | 1226 | ||
1227 | if (unlikely(err)) { | 1227 | if (unlikely(err)) { |
1228 | trace_kfree_skb(skb, udp_recvmsg); | 1228 | trace_kfree_skb(skb, udp_recvmsg); |
1229 | if (!peeked) { | ||
1230 | atomic_inc(&sk->sk_drops); | ||
1231 | UDP_INC_STATS_USER(sock_net(sk), | ||
1232 | UDP_MIB_INERRORS, is_udplite); | ||
1233 | } | ||
1229 | goto out_free; | 1234 | goto out_free; |
1230 | } | 1235 | } |
1231 | 1236 | ||
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 99d0077b56b8..07e2bfef6845 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -394,6 +394,17 @@ try_again: | |||
394 | } | 394 | } |
395 | if (unlikely(err)) { | 395 | if (unlikely(err)) { |
396 | trace_kfree_skb(skb, udpv6_recvmsg); | 396 | trace_kfree_skb(skb, udpv6_recvmsg); |
397 | if (!peeked) { | ||
398 | atomic_inc(&sk->sk_drops); | ||
399 | if (is_udp4) | ||
400 | UDP_INC_STATS_USER(sock_net(sk), | ||
401 | UDP_MIB_INERRORS, | ||
402 | is_udplite); | ||
403 | else | ||
404 | UDP6_INC_STATS_USER(sock_net(sk), | ||
405 | UDP_MIB_INERRORS, | ||
406 | is_udplite); | ||
407 | } | ||
397 | goto out_free; | 408 | goto out_free; |
398 | } | 409 | } |
399 | if (!peeked) { | 410 | if (!peeked) { |