diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2007-12-05 04:51:58 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:56:32 -0500 |
commit | 27ab2568649d5ba6c5a20212079b7c4f6da4ca0d (patch) | |
tree | 19bb85e73d7deb0adf40386af3117c2f397b653d /net/ipv4/udp.c | |
parent | c8fecf2242a0ab7230210665986b8ef915e1ae9e (diff) |
[UDP]: Avoid repeated counting of checksum errors due to peeking
Currently it is possible for two processes to peek on the same socket
and end up incrementing the error counter twice for the same packet.
This patch fixes it by making skb_kill_datagram return whether it
succeeded in unlinking the packet and only incrementing the counter
if it did.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/udp.c')
-rw-r--r-- | net/ipv4/udp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index d0283b7fcec5..f50de5d5218d 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c | |||
@@ -899,9 +899,8 @@ out: | |||
899 | return err; | 899 | return err; |
900 | 900 | ||
901 | csum_copy_err: | 901 | csum_copy_err: |
902 | UDP_INC_STATS_USER(UDP_MIB_INERRORS, is_udplite); | 902 | if (!skb_kill_datagram(sk, skb, flags)) |
903 | 903 | UDP_INC_STATS_USER(UDP_MIB_INERRORS, is_udplite); | |
904 | skb_kill_datagram(sk, skb, flags); | ||
905 | 904 | ||
906 | if (noblock) | 905 | if (noblock) |
907 | return -EAGAIN; | 906 | return -EAGAIN; |