summaryrefslogtreecommitdiffstats
path: root/net/ipv4/icmp.c
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2014-05-07 16:52:21 -0700
committerDavid S. Miller <davem@davemloft.net>2014-05-08 23:47:50 -0400
commit29a96e1f36dbd6fc7911a6d517625c656ba4809f (patch)
tree1a77a68f57237ce937162d77c84c64451647b78c /net/ipv4/icmp.c
parentde08dc1a8e7052f4cbaf920ce0af6bb261595705 (diff)
downloadlinux-stable-29a96e1f36dbd6fc7911a6d517625c656ba4809f.tar.gz
linux-stable-29a96e1f36dbd6fc7911a6d517625c656ba4809f.tar.bz2
linux-stable-29a96e1f36dbd6fc7911a6d517625c656ba4809f.zip
icmp: Call skb_checksum_simple_validate
Use skb_checksum_simple_validate to verify checksum. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/icmp.c')
-rw-r--r--net/ipv4/icmp.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 0134663fdbce..fe52666dc43c 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -908,16 +908,8 @@ int icmp_rcv(struct sk_buff *skb)
ICMP_INC_STATS_BH(net, ICMP_MIB_INMSGS);
- switch (skb->ip_summed) {
- case CHECKSUM_COMPLETE:
- if (!csum_fold(skb->csum))
- break;
- /* fall through */
- case CHECKSUM_NONE:
- skb->csum = 0;
- if (__skb_checksum_complete(skb))
- goto csum_error;
- }
+ if (skb_checksum_simple_validate(skb))
+ goto csum_error;
if (!pskb_pull(skb, sizeof(*icmph)))
goto error;