diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-11-08 05:20:19 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-08 23:53:10 -0500 |
commit | f6b8f32ca71406de718391369490f6b1e81fe0bb (patch) | |
tree | 6a9d65cc246c74a78d7274d1911baf38ffc8eaf0 /net/ipv6 | |
parent | a1ab77f97ed03f5dae66ae4c64375beffab83772 (diff) |
udp: multicast RX should increment SNMP/sk_drops counter in allocation failures
When skb_clone() fails, we should increment sk_drops and SNMP counters.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/udp.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 948e823d70c2..2915e1dad726 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c | |||
@@ -579,14 +579,20 @@ static void flush_stack(struct sock **stack, unsigned int count, | |||
579 | for (i = 0; i < count; i++) { | 579 | for (i = 0; i < count; i++) { |
580 | skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); | 580 | skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC); |
581 | 581 | ||
582 | sk = stack[i]; | ||
582 | if (skb1) { | 583 | if (skb1) { |
583 | sk = stack[i]; | ||
584 | bh_lock_sock(sk); | 584 | bh_lock_sock(sk); |
585 | if (!sock_owned_by_user(sk)) | 585 | if (!sock_owned_by_user(sk)) |
586 | udpv6_queue_rcv_skb(sk, skb1); | 586 | udpv6_queue_rcv_skb(sk, skb1); |
587 | else | 587 | else |
588 | sk_add_backlog(sk, skb1); | 588 | sk_add_backlog(sk, skb1); |
589 | bh_unlock_sock(sk); | 589 | bh_unlock_sock(sk); |
590 | } else { | ||
591 | atomic_inc(&sk->sk_drops); | ||
592 | UDP6_INC_STATS_BH(sock_net(sk), | ||
593 | UDP_MIB_RCVBUFERRORS, IS_UDPLITE(sk)); | ||
594 | UDP6_INC_STATS_BH(sock_net(sk), | ||
595 | UDP_MIB_INERRORS, IS_UDPLITE(sk)); | ||
590 | } | 596 | } |
591 | } | 597 | } |
592 | } | 598 | } |